Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clowdflows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Alain Shakour
clowdflows
Commits
68d85140
Commit
68d85140
authored
May 23, 2014
by
Janez K
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed merge dictionaries widget
parent
4bed6381
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
7 deletions
+24
-7
workflows/base/db/package_data.json
workflows/base/db/package_data.json
+21
-3
workflows/base/library.py
workflows/base/library.py
+3
-4
No files found.
workflows/base/db/package_data.json
View file @
68d85140
...
...
@@ -1202,14 +1202,32 @@
"model"
:
"workflows.abstractinput"
,
"fields"
:
{
"widget"
:
380
,
"name"
:
"Dictionar
ies
"
,
"name"
:
"Dictionar
y 1
"
,
"short_name"
:
"dct"
,
"uid"
:
"7d53195e-49f3-4873-989d-e096563f84ed"
,
"default"
:
""
,
"required"
:
false
,
"multi"
:
true
,
"multi"
:
false
,
"parameter_type"
:
null
,
"variable"
:
"dict1"
,
"parameter"
:
false
,
"order"
:
1
,
"description"
:
""
}
},
{
"pk"
:
908
,
"model"
:
"workflows.abstractinput"
,
"fields"
:
{
"widget"
:
380
,
"name"
:
"Dictionary 2"
,
"short_name"
:
"dct"
,
"uid"
:
"53efae34-3906-4732-818c-78f44e6bceea"
,
"default"
:
""
,
"required"
:
false
,
"multi"
:
false
,
"parameter_type"
:
null
,
"variable"
:
"dict
s
"
,
"variable"
:
"dict
2
"
,
"parameter"
:
false
,
"order"
:
1
,
"description"
:
""
...
...
workflows/base/library.py
View file @
68d85140
...
...
@@ -10,10 +10,9 @@ def base_concatenate_lists(input_dict):
return
output_dict
def
base_merge_dictionaries
(
input_dict
):
dicts
=
input_dict
[
'dicts'
]
items
=
[]
for
d
in
dicts
:
items
=
items
+
d
.
items
()
dict1
=
input_dict
[
'dict1'
]
dict2
=
input_dict
[
'dict2'
]
items
=
dict1
.
items
()
+
dict2
.
items
()
output_dict
=
{}
output_dict
[
'dict'
]
=
dict
(
items
)
return
output_dict
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment