Skip to content

Commit 0f2cc49

Browse files
Merge pull request #19 from cortex-cms/bugfixes/COR-382+502-Tree-Saving-and-Refactoring
Bugfixes/cor 382+502 tree saving and refactoring
2 parents d101af9 + afc096b commit 0f2cc49

File tree

4 files changed

+6
-160
lines changed

4 files changed

+6
-160
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%label.mdl-checkbox.mdl-js-checkbox.mdl-js-ripple-effect{ for: @options[:node]["id"] }
2-
= context[:form].check_box "data[values][#{@options[:node]['id']}]", { checked: value, class: 'mdl-checkbox__input', id: @options[:node]["id"] }, 1, nil
3-
= context[:form].label :data, display_lineage, class: 'mdl-checkbox__label'
2+
= @options[:form].check_box "data[values][#{@options[:node]['id']}]", { checked: value, class: 'mdl-checkbox__input', id: @options[:node]["id"] }, 1, nil
3+
= @options[:form].label :data, display_lineage, class: 'mdl-checkbox__label'
44

55
- if @options[:node]["children"].any?
66
- @options[:node]["children"].each do |child|
7-
= cell(Plugins::Core::CheckboxCell, nil, node: child, child: child_identifier, data: @options[:data]).(:checkbox)
7+
= cell(Plugins::Core::CheckboxCell, nil, form: @options[:form], node: child, child: child_identifier, data: @options[:data]).(:checkbox)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%h4
22
= render_label
3-
3+
44
- @options[:metadata]["data"]["tree_array"].each do |node|
55
= render_field_id
6-
= cell(Plugins::Core::CheckboxCell, nil, node: node, data: data).(:checkbox)
6+
= cell(Plugins::Core::CheckboxCell, nil, form: @options[:form], node: node, data: data).(:checkbox)

app/models/asset_field_type.rb.orig

Lines changed: 0 additions & 154 deletions
This file was deleted.

app/models/tree_field_type.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def data=(data_hash)
1111
if values.is_a?(Hash)
1212
@values = values.keys
1313
else
14-
@values = [values]
14+
@values = values
1515
end
1616
end
1717

0 commit comments

Comments
 (0)