Commit fc3f277f authored by Anze Vavpetic's avatar Anze Vavpetic
Browse files

Merge branch 'dev' of workflow.ijs.si:mothra into dev

Conflicts:
	mothra/settings.py
parents 9712d6fd 22221f4d
......@@ -198,6 +198,7 @@ else:
'workflows.bioinformatics',
'workflows.subgroup_discovery',
'workflows.nlp',
'workflows.base',
'website',
'signuplogin',
'django_extensions',
......
[
{
"pk": 2,
"model": "workflows.category",
"fields": {
"uid": "bbf1e628-8be6-4178-8d93-765de278c0e4",
"parent": null,
"workflow": null,
"user": null,
"order": 1,
"name": "Files"
}
},
{
"pk": 1,
"model": "workflows.category",
"fields": {
"uid": "9b145e48-9cc0-4a24-9ac7-0df48e879361",
"parent": null,
"workflow": null,
"user": null,
"order": 1,
"name": "Integers"
}
},
{
"pk": 3,
"model": "workflows.category",
"fields": {
"uid": "01ad639d-acb8-45c0-bc5e-bc8739bb4c95",
"parent": null,
"workflow": null,
"user": null,
"order": 1,
"name": "Objects"
}
},
{
"pk": 12,
"model": "workflows.category",
"fields": {
"uid": "11865b03-cb06-4d50-9174-69d920cbe4ec",
"parent": null,
"workflow": null,
"user": null,
"order": 1,
"name": "Strings"
}
},
{
"pk": 2,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"treeview_image": "treeview/d914a910.png",
"name": "Add integers",
"is_streaming": false,
"uid": "e898b974-bafa-4b67-8918-b47b801e063e",
"interaction_view": "",
"image": "images/d914a910.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "add_integers",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 1,
"description": "Adds two integers"
}
},
{
"pk": 70,
"model": "workflows.abstractwidget",
"fields": {
"category": 12,
"treeview_image": "treeview/concatenate_string.png",
"name": "Concatenate Strings",
"is_streaming": false,
"uid": "28c00f15-c6e1-45b7-9825-14fdc9819584",
"interaction_view": "",
"image": "images/concatenate_string.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "concatenate_strings",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 1,
"description": ""
}
},
{
"pk": 9,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"treeview_image": "treeview/Task-List-icon.png",
"name": "Create List",
"is_streaming": false,
"uid": "ed60cacd-633c-4c7c-b963-a5fda548bed4",
"interaction_view": "",
"image": "images/Task-List-icon.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "create_list",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 1,
"description": ""
}
},
{
"pk": 7,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"treeview_image": "treeview/File.png",
"name": "File to string",
"is_streaming": false,
"uid": "ff26380c-dd36-47c4-92ec-4526e199abbc",
"interaction_view": "",
"image": "images/File.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "file_to_string",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 1,
"description": ""
}
},
{
"pk": 4,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"treeview_image": "treeview/d914a910_2.png",
"name": "Add multiple integers",
"is_streaming": false,
"uid": "e327e9ce-0a1d-4dcc-90ac-45ea4fd74707",
"interaction_view": "",
"image": "images/d914a910_2.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "add_multiple",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 2,
"description": ""
}
},
{
"pk": 117,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"treeview_image": "treeview/Create-Range_1.png",
"name": "Create Range",
"is_streaming": false,
"uid": "98e1fec5-e771-4f75-8615-eac6577e64c1",
"interaction_view": "",
"image": "images/Create-Range_1.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "create_range",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 2,
"description": ""
}
},
{
"pk": 69,
"model": "workflows.abstractwidget",
"fields": {
"category": 12,
"treeview_image": "treeview/string.png",
"name": "Create String",
"is_streaming": false,
"uid": "1b38bbab-7f89-4469-94cd-2f481f9c61f7",
"interaction_view": "",
"image": "images/string.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "create_string",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 2,
"description": "Creates a string"
}
},
{
"pk": 6,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"treeview_image": "treeview/Upload-icon.png",
"name": "Load file",
"is_streaming": false,
"uid": "ff4e5d1a-c09b-4c1c-85e0-190c3b933418",
"interaction_view": "",
"image": "images/Upload-icon.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "load_file",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 2,
"description": ""
}
},
{
"pk": 1,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"treeview_image": "treeview/417px-Latex_integers.svg.png",
"name": "Create Integer",
"is_streaming": false,
"uid": "8b20d4ad-c420-4156-973d-48d6d15934ba",
"interaction_view": "",
"image": "images/417px-Latex_integers.svg.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "create_integer",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 3,
"description": "Creates an integer object from a parameter."
}
},
{
"pk": 72,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"treeview_image": "treeview/482063585452602669.png",
"name": "Delay",
"is_streaming": false,
"uid": "51a88c36-60c3-44c1-ba5a-b895c0ed0370",
"interaction_view": "",
"image": "images/482063585452602669.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "delay",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": true,
"order": 3,
"description": "Delays for a certain amount of seconds"
}
},
{
"pk": 71,
"model": "workflows.abstractwidget",
"fields": {
"category": 12,
"treeview_image": "treeview/display_string.png",
"name": "Display String",
"is_streaming": false,
"uid": "2c69b211-05fe-49a2-8de1-d38971e75b95",
"interaction_view": "",
"image": "images/display_string.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "display_string",
"action": "display_string",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 3,
"description": ""
}
},
{
"pk": 189,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"treeview_image": "treeview/Upload-icon_1.png",
"name": "Load file to string",
"is_streaming": false,
"uid": "866b596e-0131-43f6-969d-97f43c66ef0d",
"interaction_view": "",
"image": "images/Upload-icon_1.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "load_to_string",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 3,
"description": ""
}
},
{
"pk": 109,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"treeview_image": "treeview/ensemble-small.png",
"name": "Ensemble",
"is_streaming": false,
"uid": "e2faf966-57a8-4bd9-af66-bb7921be4431",
"interaction_view": "",
"image": "images/ensemble-small.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "ensemble",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 4,
"description": ""
}
},
{
"pk": 5,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"treeview_image": "",
"name": "Filter integers",
"is_streaming": false,
"uid": "cf0af098-719c-4dce-bf75-0b3018eafb03",
"interaction_view": "filter_integers",
"image": "",
"package": "base",
"static_image": "",
"post_interact_action": "filter_integers_post",
"user": null,
"visualization_view": "",
"action": "filter_integers",
"wsdl_method": "",
"wsdl": "",
"interactive": true,
"has_progress_bar": false,
"order": 4,
"description": "Filters some integers"
}
},
{
"pk": 219,
"model": "workflows.abstractwidget",
"fields": {
"category": 2,
"treeview_image": "treeview/1688041475.png",
"name": "String to file",
"is_streaming": false,
"uid": "442f5484-494d-4bd7-b1c2-74c1153dd1fe",
"interaction_view": "",
"image": "images/1688041475.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "string_to_file",
"action": "string_to_file",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 4,
"description": ""
}
},
{
"pk": 93,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"treeview_image": "",
"name": "Multiply integers",
"is_streaming": false,
"uid": "c950af9c-be87-4761-a69e-e37f0c26cacb",
"interaction_view": "",
"image": "",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "multiply_integers",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 5,
"description": ""
}
},
{
"pk": 8,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"treeview_image": "treeview/glass_1.png",
"name": "Object viewer",
"is_streaming": false,
"uid": "9c7ff1bd-6026-4ebd-b44f-ed889a8b0fad",
"interaction_view": "",
"image": "images/glass_3.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "object_viewer",
"action": "object_viewer",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 5,
"description": "Displays any input."
}
},
{
"pk": 196,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"treeview_image": "treeview/pickle.png",
"name": "Pickle object",
"is_streaming": false,
"uid": "1f6bd626-331e-4ac3-b55f-cec8fcd8fd9e",
"interaction_view": "",
"image": "images/pickle.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "pickle_object",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 6,
"description": ""
}
},
{
"pk": 3,
"model": "workflows.abstractwidget",
"fields": {
"category": 1,
"treeview_image": "treeview/d914a910_1.png",
"name": "Subtract integers",
"is_streaming": false,
"uid": "c6cf5c17-f6a6-4076-bf35-ecb06d72da86",
"interaction_view": "",
"image": "images/d914a910_1.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "subtract_integers",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 6,
"description": "Subtracts two integers"
}
},
{
"pk": 197,
"model": "workflows.abstractwidget",
"fields": {
"category": 3,
"treeview_image": "treeview/pickle_1.png",
"name": "Unpickle object",
"is_streaming": false,
"uid": "58975866-d556-49ff-84bf-70e31af4638c",
"interaction_view": "",
"image": "images/pickle_1.png",
"package": "base",
"static_image": "",
"post_interact_action": "",
"user": null,
"visualization_view": "",
"action": "unpickle_object",
"wsdl_method": "",
"wsdl": "",
"interactive": false,
"has_progress_bar": false,
"order": 7,
"description": ""
}
},
{
"pk": 1,
"model": "workflows.abstractoutput",
"fields": {
"widget": 1,
"name": "Integer",
"short_name": "int",
"variable": "integer",
"uid": "68ec6254-d17a-4867-b57c-6f95f7a72527",
"order": 1,
"description": "The returned integer."
}
},
{
"pk": 2,
"model": "workflows.abstractoutput",
"fields": {
"widget": 2,
"name": "Integer",
"short_name": "int",
"variable": "integer",
"uid": "da76c9e0-d374-4455-a708-6b5de8023f57",
"order": 1,
"description": ""
}
},
{
"pk": 3,
"model": "workflows.abstractoutput",
"fields": {
"widget": 3,
"name": "Integer",
"short_name": "int",
"variable": "integer",
"uid": "4488e496-5b41-4081-8715-ec82404d2d98",
"order": 1,
"description": ""
}
},
{
"pk": 4,
"model": "workflows.abstractoutput",