Attachment 9307 Details for Bug 41865 – patch

[patch] patch

41865.patch (text/plain), 1.21 KB, created by Florian Best on 2017-12-07 18:39:16 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-12-07 18:39:16 CET

Size: 1.21 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/syntax.py b/management/univention-directory-manager-modules/modules/univention/admin/syntax.py
>index f88be4f..fa767a5 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/syntax.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/syntax.py
>@@ -609,6 +609,14 @@ def parse(self, text):
> 			raise univention.admin.uexceptions.valueError(_("Value must be a number!"))
> 
> 
>+class integerOrEmpty(integer):
>+	@classmethod
>+	def parse(self, text):
>+		if not text:
>+			return
>+		return super(integerOrEmpty, self).parse(text)
>+
>+
> class boolean(simple):
> 
> 	"""
>@@ -1576,7 +1584,7 @@ class TimeString(simple):
> 
> class UNIX_TimeInterval(complex):
> 	min_elements = 1
>-	subsyntaxes = (('', integer), ('', TimeUnits))
>+	subsyntaxes = (('', integerOrEmpty), ('', TimeUnits))
> 	size = ('Half', 'Half')
> 
> 	@classmethod
>@@ -1592,6 +1600,8 @@ class UNIX_BoundedTimeInterval(UNIX_TimeInterval):
> 	@classmethod
> 	def parse(cls, texts):
> 		parsed = super(UNIX_BoundedTimeInterval, cls).parse(texts)
>+		if parsed[0] is None:
>+			return [None, None]
> 
> 		in_seconds = int(parsed[0])
> 		if len(parsed) > 1:

Actions: View | Diff

Attachments on bug 41865: 8007 | 9307