Commit 3b2935c8dbeaf74d5d2e54cd30063fc19db860bd
1 parent
d30ccbdb
Exists in
master
and in
7 other branches
Add new fields to search filters
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com> Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com>
Showing
1 changed file
with
12 additions
and
0 deletions
Show diff stats
colab/search/forms.py
| ... | ... | @@ -35,6 +35,10 @@ class ColabSearchForm(SearchForm): |
| 35 | 35 | keywords = forms.CharField(required=False, label=_(u'Keywords')) |
| 36 | 36 | collaborators = forms.CharField(required=False, label=_(u'Collaborators')) |
| 37 | 37 | repository_name = forms.CharField(required=False, label=_(u'Repository')) |
| 38 | + body = forms.CharField(required=False, label=_(u'Content')) | |
| 39 | + description = forms.CharField(required=False, label=_(u'Description')) | |
| 40 | + category = forms.CharField(required=False, label=_(u'Category')) | |
| 41 | + title = forms.CharField(required=False, label=_(u'Title')) | |
| 38 | 42 | username = forms.CharField(required=False, label=_(u'Username')) |
| 39 | 43 | name = forms.CharField(required=False, label=_(u'Name')) |
| 40 | 44 | institution = forms.CharField(required=False, label=_(u'Institution')) |
| ... | ... | @@ -151,6 +155,14 @@ class ColabSearchForm(SearchForm): |
| 151 | 155 | sqs = sqs.filter( |
| 152 | 156 | repository_name=self.cleaned_data['repository_name'] |
| 153 | 157 | ) |
| 158 | + if self.cleaned_data['body']: | |
| 159 | + sqs = sqs.filter(body=self.cleaned_data['body']) | |
| 160 | + if self.cleaned_data['description']: | |
| 161 | + sqs = sqs.filter(description=self.cleaned_data['description']) | |
| 162 | + if self.cleaned_data['category']: | |
| 163 | + sqs = sqs.filter(category=self.cleaned_data['category']) | |
| 164 | + if self.cleaned_data['title']: | |
| 165 | + sqs = sqs.filter(title=self.cleaned_data['title']) | |
| 154 | 166 | if self.cleaned_data['username']: |
| 155 | 167 | sqs = sqs.filter(username=self.cleaned_data['username']) |
| 156 | 168 | if self.cleaned_data['name']: | ... | ... |