Skip to content

Commit 01862e4

Browse files
committed
Fix up naming for a ContentItemFieldType method, refactor a bit, fix a bunch FieldTypes for ElasticSearch index storage
1 parent 87b8e09 commit 01862e4

9 files changed

+10
-10
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
- if asset
2-
= image_tag(asset_thumb(asset), height: '50px')
2+
= image_tag(asset['style_urls'][config[:thumbnail_style]], height: '50px')

app/cells/plugins/core/content_item/popup.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= render_field_id
2-
= render_popup
2+
= render_content_item_id
33

44
= render_label
55
%br

app/cells/plugins/core/content_item_cell.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ def render_label
1515
"Add #{field.name}"
1616
end
1717

18-
def render_popup
19-
@options[:form].text_field 'data[content_item_id]', value: value, style: 'display:none;'
18+
def render_content_item_id
19+
@options[:form].hidden_field 'data[content_item_id]', value: value
2020
end
2121
end
2222
end

app/models/boolean_field_type.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def data=(data_hash)
77

88
def field_item_as_indexed_json_for_field_type(field_item, options = {})
99
json = {}
10-
json[mapping_field_name] = field_item.data['boolean']
10+
json[mapping_field_name] = field_item.data['value']
1111
json
1212
end
1313

app/models/content_item_field_type.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def data=(data_hash)
77

88
def field_item_as_indexed_json_for_field_type(field_item, options = {})
99
json = {}
10-
json[mapping_field_name] = field_item.data['content_item']
10+
json[mapping_field_name] = field_item.data['content_item_id']
1111
json
1212
end
1313

app/models/date_time_field_type.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def data=(data_hash)
1010

1111
def field_item_as_indexed_json_for_field_type(field_item, options = {})
1212
json = {}
13-
json[mapping_field_name] = field_item.data['date_time']
13+
json[mapping_field_name] = field_item.data['timestamp']
1414
json
1515
end
1616

app/models/tag_field_type.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def data=(data_hash)
1010

1111
def field_item_as_indexed_json_for_field_type(field_item, options = {})
1212
json = {}
13-
json[mapping_field_name] = field_item.data['tag']
13+
json[mapping_field_name] = field_item.data['tag_list']
1414
json
1515
end
1616

app/models/tree_field_type.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def data=(data_hash)
2121

2222
def field_item_as_indexed_json_for_field_type(field_item, options = {})
2323
json = {}
24-
json[mapping_field_name] = field_item.data['tree']
24+
json[mapping_field_name] = field_item.data['values']
2525
json
2626
end
2727

app/models/user_field_type.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def data=(data_hash)
1010

1111
def field_item_as_indexed_json_for_field_type(field_item, options = {})
1212
json = {}
13-
json[mapping_field_name] = field_item.data['user']
13+
json[mapping_field_name] = field_item.data['user_id']
1414
json
1515
end
1616

0 commit comments

Comments
 (0)