Showing
3 changed files
with
22 additions
and
2 deletions
| @@ -71,5 +71,25 @@ module Kanjai | @@ -71,5 +71,25 @@ module Kanjai | ||
| 71 | content | 71 | content |
| 72 | end | 72 | end |
| 73 | 73 | ||
| 74 | + def sort_markers(page_content, markers) | ||
| 75 | + page_template = page_content.page.page_template | ||
| 76 | + if page_template | ||
| 77 | + subpart = page_template.template_parts.where(code: page_content.type_content).first | ||
| 78 | + if subpart | ||
| 79 | + p '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' | ||
| 80 | + markers_position = {} | ||
| 81 | + subpart.field_options.each_with_index do |item, index| | ||
| 82 | + markers_position[item[:name]] = index + 1 | ||
| 83 | + end | ||
| 84 | + | ||
| 85 | + return markers.sort{|a,b| (markers_position[a.marker] <=> markers_position[b.marker] ) } | ||
| 86 | + | ||
| 87 | + return markers | ||
| 88 | + end | ||
| 89 | + end | ||
| 90 | + | ||
| 91 | + return markers | ||
| 92 | + end | ||
| 93 | + | ||
| 74 | end | 94 | end |
| 75 | end | 95 | end |
| 1 | <%= fields_for @obj do |form| %> | 1 | <%= fields_for @obj do |form| %> |
| 2 | - <%= form.fields_for :page_content_markers, @obj.page_content_markers.where(:row_item => 0).order('id') do |form2| %> | 2 | + <%= form.fields_for :page_content_markers, sort_markers(@obj, @obj.page_content_markers.where(:row_item => 0).order('id')) do |form2| %> |
| 3 | <div class="form-group"> | 3 | <div class="form-group"> |
| 4 | <%= form2.label :text_value, form2.object.marker_name || form2.object.marker, :class => "control-label" %> | 4 | <%= form2.label :text_value, form2.object.marker_name || form2.object.marker, :class => "control-label" %> |
| 5 | <% if form2.object.get_marker_type(@type_content) == 'string' %> | 5 | <% if form2.object.get_marker_type(@type_content) == 'string' %> |