Download as
Browse Code »

Commit 62d301cb417bfd837cec9a99e195d751a6872fd4

Authored by Luan
1 parent 647cb8d0
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding modified_by option to forms

Showing 1 changed file with 6 additions and 0 deletions   Show diff stats
src/search/forms.py
  Diff comments   View file @62d301c
@@ -17,6 +17,7 @@ class ColabSearchForm(SearchForm): @@ -17,6 +17,7 @@ class ColabSearchForm(SearchForm):
17 order = forms.CharField(widget=forms.HiddenInput(), required=False) 17 order = forms.CharField(widget=forms.HiddenInput(), required=False)
18 type = forms.CharField(required=False, label=_(u'Type')) 18 type = forms.CharField(required=False, label=_(u'Type'))
19 author = forms.CharField(required=False, label=_(u'Author')) 19 author = forms.CharField(required=False, label=_(u'Author'))
  20 + modified_by = forms.CharField(required=False, label=_(u'Modified by'))
20 # ticket status 21 # ticket status
21 tag = forms.CharField(required=False, label=_(u'Status')) 22 tag = forms.CharField(required=False, label=_(u'Status'))
22 # mailinglist tag 23 # mailinglist tag
@@ -122,6 +123,11 @@ class ColabSearchForm(SearchForm): @@ -122,6 +123,11 @@ class ColabSearchForm(SearchForm):
122 fullname_and_username__contains=self.cleaned_data['author'] 123 fullname_and_username__contains=self.cleaned_data['author']
123 ) 124 )
124 125
  126 + if self.cleaned_data['modified_by']:
  127 + sqs = sqs.filter(
  128 + fullname_and_username__contains=self.cleaned_data['modified_by']
  129 + )
  130 +
125 if self.cleaned_data['milestone']: 131 if self.cleaned_data['milestone']:
126 sqs = sqs.filter(milestone=self.cleaned_data['milestone']) 132 sqs = sqs.filter(milestone=self.cleaned_data['milestone'])
127 if self.cleaned_data['priority']: 133 if self.cleaned_data['priority']: