@@ -27,13 +27,14 @@ class PipelineSerializer(serializers.HyperlinkedModelSerializer):
27
27
default_parameters = serializers .HyperlinkedIdentityField (
28
28
view_name = 'pipeline-defaultparameter-list' )
29
29
instances = serializers .HyperlinkedIdentityField (view_name = 'pipelineinstance-list' )
30
+ workflows = serializers .HyperlinkedIdentityField (view_name = 'workflow-list' )
30
31
31
32
class Meta :
32
33
model = Pipeline
33
34
fields = ('url' , 'id' , 'name' , 'locked' , 'authors' , 'category' , 'description' ,
34
35
'plugin_tree' , 'plugin_inst_id' , 'owner_username' , 'creation_date' ,
35
36
'modification_date' , 'plugins' , 'plugin_pipings' , 'default_parameters' ,
36
- 'instances' )
37
+ 'instances' , 'workflows' )
37
38
38
39
def create (self , validated_data ):
39
40
"""
@@ -118,10 +119,10 @@ def validate_plugin_inst_id(self, plugin_inst_id):
118
119
raise serializers .ValidationError (
119
120
["Couldn't find any plugin instance with id %s." % plugin_inst_id ])
120
121
plg = plg_inst .plugin
121
- if plg .meta .type == 'fs ' :
122
+ if plg .meta .type != 'ds ' :
122
123
raise serializers .ValidationError (
123
- ["Plugin instance of %s which is of type 'fs' and therefore can not "
124
- " be used as the root of a new pipeline." % plg .meta .name ])
124
+ [f "Plugin instance of %s which is of type { plg . meta . type } and therefore "
125
+ f"can not be used as the root of a new pipeline." % plg .meta .name ])
125
126
return plg_inst
126
127
127
128
def validate_plugin_tree (self , plugin_tree ):
@@ -313,19 +314,21 @@ def _add_plugin_tree_to_pipeline(pipeline, tree_dict):
313
314
314
315
class PluginPipingSerializer (serializers .HyperlinkedModelSerializer ):
315
316
plugin_id = serializers .ReadOnlyField (source = 'plugin.id' )
317
+ plugin_name = serializers .ReadOnlyField (source = 'plugin.meta.name' )
318
+ plugin_version = serializers .ReadOnlyField (source = 'plugin.version' )
316
319
pipeline_id = serializers .ReadOnlyField (source = 'pipeline.id' )
317
320
previous_id = serializers .ReadOnlyField (source = 'previous.id' )
318
321
previous = serializers .HyperlinkedRelatedField (view_name = 'pluginpiping-detail' ,
319
- read_only = True )
322
+ read_only = True )
320
323
plugin = serializers .HyperlinkedRelatedField (view_name = 'plugin-detail' ,
321
324
read_only = True )
322
325
pipeline = serializers .HyperlinkedRelatedField (view_name = 'pipeline-detail' ,
323
326
read_only = True )
324
327
325
328
class Meta :
326
329
model = PluginPiping
327
- fields = ('url' , 'id' , 'plugin_id ' , 'pipeline_id ' , 'previous_id' , 'previous ' ,
328
- 'plugin' , 'pipeline' )
330
+ fields = ('url' , 'id' , 'previous_id ' , 'plugin_id ' , 'plugin_name ' ,
331
+ 'plugin_version' , 'pipeline_id' , 'previous' , ' plugin' , 'pipeline' )
329
332
330
333
331
334
class DefaultPipingStrParameterSerializer (serializers .HyperlinkedModelSerializer ):
0 commit comments