Skip to content

Commit b3051a4

Browse files
authored
Merge pull request #617 from jbernal0019/master
Add type filter to plugin instances and name_exact filter to pipelines
2 parents dd69876 + 07847ef commit b3051a4

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

chris_backend/pipelines/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,15 @@ class PipelineFilter(FilterSet):
190190
owner_username = django_filters.CharFilter(field_name='owner__username',
191191
lookup_expr='exact')
192192
name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
193+
name_exact = django_filters.CharFilter(field_name='name', lookup_expr='exact')
193194
category = django_filters.CharFilter(field_name='category', lookup_expr='icontains')
194195
description = django_filters.CharFilter(field_name='description',
195196
lookup_expr='icontains')
196197
authors = django_filters.CharFilter(field_name='authors', lookup_expr='icontains')
197198

198199
class Meta:
199200
model = Pipeline
200-
fields = ['id', 'owner_username', 'name', 'category', 'description',
201+
fields = ['id', 'owner_username', 'name', 'name_exact', 'category', 'description',
201202
'authors', 'min_creation_date', 'max_creation_date']
202203

203204

chris_backend/plugininstances/models.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,15 @@ class PluginInstanceFilter(FilterSet):
220220
lookup_expr='exact')
221221
plugin_version = django_filters.CharFilter(field_name='plugin__version',
222222
lookup_expr='exact')
223+
plugin_type = django_filters.CharFilter(field_name='plugin__meta__type',
224+
lookup_expr='exact')
223225

224226
class Meta:
225227
model = PluginInstance
226228
fields = ['id', 'min_start_date', 'max_start_date', 'min_end_date',
227229
'max_end_date', 'root_id', 'previous_id', 'title', 'status',
228230
'owner_username', 'feed_id', 'plugin_id', 'plugin_name',
229-
'plugin_name_exact', 'plugin_version', 'workflow_id']
231+
'plugin_name_exact', 'plugin_version', 'plugin_type', 'workflow_id']
230232

231233
def filter_by_root_id(self, queryset, name, value):
232234
"""

0 commit comments

Comments
 (0)