Improve the transition trigger list view
Display event type namespaces in the transition trigger view. Sort events type list in the transition trigger view. Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -286,6 +286,8 @@
|
||||
* Improve search negation logic.
|
||||
* Add support for search field transformations.
|
||||
* Disable hiding page navigation on idle.
|
||||
* Display namespace in the transition trigger view.
|
||||
* Sort events list in the transition trigger view.
|
||||
|
||||
3.1.11 (2019-04-XX)
|
||||
===================
|
||||
|
||||
@@ -715,6 +715,8 @@ Other changes
|
||||
outside of quotes are now interpreted as negation.
|
||||
- Add support for search field transformations.
|
||||
- Disable hiding page navigation on idle.
|
||||
- Display namespace in the transition trigger view.
|
||||
- Sort events list in the transition trigger view.
|
||||
|
||||
|
||||
Removals
|
||||
|
||||
@@ -113,6 +113,10 @@ class WorkflowTransitionForm(forms.ModelForm):
|
||||
|
||||
|
||||
class WorkflowTransitionTriggerEventRelationshipForm(forms.Form):
|
||||
namespace = forms.CharField(
|
||||
label=_('Namespace'), required=False,
|
||||
widget=forms.TextInput(attrs={'readonly': 'readonly'})
|
||||
)
|
||||
label = forms.CharField(
|
||||
label=_('Label'), required=False,
|
||||
widget=forms.TextInput(attrs={'readonly': 'readonly'})
|
||||
@@ -130,6 +134,7 @@ class WorkflowTransitionTriggerEventRelationshipForm(forms.Form):
|
||||
*args, **kwargs
|
||||
)
|
||||
|
||||
self.fields['namespace'].initial = self.initial['event_type'].namespace
|
||||
self.fields['label'].initial = self.initial['event_type'].label
|
||||
|
||||
relationship = self.initial['transition'].trigger_events.filter(
|
||||
|
||||
@@ -685,9 +685,6 @@ class SetupWorkflowTransitionTriggerEventListView(ExternalObjectMixin, FormView)
|
||||
SetupWorkflowTransitionTriggerEventListView, self
|
||||
).form_valid(form=form)
|
||||
|
||||
def get_object(self):
|
||||
return self.external_object
|
||||
|
||||
def get_extra_context(self):
|
||||
return {
|
||||
'form_display_mode_table': True,
|
||||
@@ -713,6 +710,11 @@ class SetupWorkflowTransitionTriggerEventListView(ExternalObjectMixin, FormView)
|
||||
name__in=event_type_ids
|
||||
)
|
||||
|
||||
# Sort queryset in Python by namespace, then by label
|
||||
event_type_queryset = sorted(
|
||||
event_type_queryset, key=lambda x: (x.namespace, x.label)
|
||||
)
|
||||
|
||||
for event_type in event_type_queryset:
|
||||
initial.append({
|
||||
'transition': obj,
|
||||
@@ -720,6 +722,9 @@ class SetupWorkflowTransitionTriggerEventListView(ExternalObjectMixin, FormView)
|
||||
})
|
||||
return initial
|
||||
|
||||
def get_object(self):
|
||||
return self.external_object
|
||||
|
||||
def get_post_action_redirect(self):
|
||||
return reverse(
|
||||
viewname='document_states:setup_workflow_transition_list',
|
||||
|
||||
Reference in New Issue
Block a user