[copr/copr] 02/02: frontend: style fixes related to previous commit

This is an automated email from the git hooks/post-receive script. praiskup pushed a commit to branch master in repository copr/copr. commit 4dec6db6e709a9b97cc0b20ba00b0c627844de0f Author: Pavel Raiskup <praiskup(a)redhat.com&gt; AuthorDate: Wed Feb 5 17:21:19 2020 +0100 frontend: style fixes related to previous commit Relates: #1237 --- frontend/coprs_frontend/coprs/forms.py | 31 +++++++++++++--------- .../coprs/templates/coprs/detail/edit_chroot.html | 2 +- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/frontend/coprs_frontend/coprs/forms.py b/frontend/coprs_frontend/coprs/forms.py index 58b9b18..e92029b 100644 --- a/frontend/coprs_frontend/coprs/forms.py +++ b/frontend/coprs_frontend/coprs/forms.py @@ -169,6 +169,7 @@ class NameCharactersValidator(object): class ModuleEnableNameValidator(object): def __call__(self, form, field): + already_enabled = {} for module in form.module_toggle.data.split(","): if module == "": return True @@ -177,21 +178,27 @@ class ModuleEnableNameValidator(object): module_name, stream = module.strip().split(":") except ValueError: raise ValidationError( - message="Module name '{0}' must consist of two parts separated with colon.\ - Eg. module:stream" - .format(module)) + message=( + "Module name '{0}' must consist of two parts separated " + "with colon, e.g. module:stream" + ).format(module)) pattern = re.compile(re.compile(r"^([a-zA-Z0-9-_!][^\ ]*)$")) - if pattern.match(module_name) == None: - raise ValidationError( - message="Module name '{0}' must contain only letters, digits, dashes, underscores." - .format(module_name)) + if pattern.match(module_name) is None: + raise ValidationError(message=( + "Module name '{0}' must contain only letters, digits, " + "dashes, underscores.").format(module_name)) + + if module_name in already_enabled: + raise ValidationError("Module name '{0}' specified multiple " + "times".format(module_name)) + else: + already_enabled[module_name] = True - if pattern.match(stream) == None: - raise ValidationError( - message="Stream part of module name '{0}' must contain only letters,\ - digits, dashes, underscores." - .format(stream)) + if pattern.match(stream) is None: + raise ValidationError(message=( + "Stream part of module name '{0}' must contain only " + "letters, digits, dashes, underscores.").format(stream)) class ChrootsValidator(object): def __call__(self, form, field): diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html index fb11de2..43cb3ad 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html @@ -36,7 +36,7 @@ form.module_toggle, size=80, info='You can specify modules which will be enabled for builds in the given chroot.', - placeholder='module:stream, module1:stream1' + placeholder='Comma separated list of modules, e.g. module:stream, module1:stream1' ) }} -- To stop receiving notification emails like this one, please contact the administrator of this repository.