diff options
Diffstat (limited to 'dashboard/src/workflow/forms.py')
| -rw-r--r-- | dashboard/src/workflow/forms.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/dashboard/src/workflow/forms.py b/dashboard/src/workflow/forms.py index feb32f2..f781663 100644 --- a/dashboard/src/workflow/forms.py +++ b/dashboard/src/workflow/forms.py @@ -41,6 +41,7 @@ class SearchableSelectMultipleWidget(widgets.SelectMultiple): self.default_entry = attrs.get("default_entry", "") self.edit = attrs.get("edit", False) self.wf_type = attrs.get("wf_type") + self.incompatible = attrs.get("incompatible", "false") super(SearchableSelectMultipleWidget, self).__init__(attrs) @@ -61,7 +62,8 @@ class SearchableSelectMultipleWidget(widgets.SelectMultiple): 'initial': self.initial, 'default_entry': self.default_entry, 'edit': self.edit, - 'wf_type': self.wf_type + 'wf_type': self.wf_type, + 'incompatible': self.incompatible } @@ -101,13 +103,6 @@ class ResourceSelectorForm(forms.Form): displayable['id'] = res.id resources[res.id] = displayable - if bundle: - displayable = {} - displayable['small_name'] = bundle.name - displayable['expanded_name'] = "Current bundle" - displayable['string'] = bundle.description - displayable['id'] = "repo bundle" - resources["repo bundle"] = displayable attrs = { 'set': resources, 'show_from_noentry': "true", @@ -159,13 +154,15 @@ class SWConfigSelectorForm(forms.Form): displayable['id'] = config.id configs[config.id] = displayable - if bundle: + incompatible_choice = "false" + if bundle and bundle.id not in configs: displayable = {} displayable['small_name'] = bundle.name - displayable['expanded_name'] = "Current configuration" + displayable['expanded_name'] = bundle.owner.username displayable['string'] = bundle.description - displayable['id'] = "repo bundle" - configs['repo bundle'] = displayable + displayable['id'] = bundle.id + configs[bundle.id] = displayable + incompatible_choice = "true" attrs = { 'set': configs, @@ -177,7 +174,8 @@ class SWConfigSelectorForm(forms.Form): 'placeholder': "config", 'initial': chosen, 'edit': edit, - 'wf_type': 2 + 'wf_type': 2, + 'incompatible': incompatible_choice } return attrs |