sort field for edit in page content by name, add solution choose menu item

 PATH
 PATH
   remote: .
   remote: .
   specs:
   specs:
-    kanjai (0.0.245)
+    kanjai (0.0.246)
       acts-as-taggable-on (~> 6.5)
       acts-as-taggable-on (~> 6.5)
       acts_as_list
       acts_as_list
       acts_as_tree
       acts_as_tree

@@ -47,7 +47,7 @@ module Kanjai
 
 
     def update
     def update
       @page_template = PageTemplate.find(params[:id])
       @page_template = PageTemplate.find(params[:id])
-      @page_template.unzip = false
+      @page_template.unzip = false if params[:page_template][:attachment_file_name].present?
 
 
       if @page_template.update(permitted_params[:page_template])
       if @page_template.update(permitted_params[:page_template])
         render json: {status: 'ok'}
         render json: {status: 'ok'}
@@ -99,7 +99,7 @@ module Kanjai
     private
     private
 
 
     def permitted_params
     def permitted_params
-      params.permit(:page_template => [:title, :attachment_file_name, :notice,
+      params.permit(:page_template => [:title, :attachment_file_name, :notice, :menu,
                                        page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name]
                                        page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name]
                     ])
                     ])
     end
     end

@@ -78,13 +78,19 @@ module Kanjai
         layer.gsub!('<meta name="csrf-token" content="###CSRF_TOKEN###"/>', '')
         layer.gsub!('<meta name="csrf-token" content="###CSRF_TOKEN###"/>', '')
       end
       end
 
 
-      layer.scan(/(<element name="([\w\W]+?)" type="([\w\W]+?)"><\/element>)/).each do |item|
+      layer.scan(/(<element name="([\w\W]*?)" type="([\w\W]+?)"><\/element>)/).each do |item|
         content = item[0]
         content = item[0]
-        name = item[1]
+        name = item[1].to_s
         type = item[2]
         type = item[2]
         code = name.parameterize
         code = name.parameterize
 
 
-        template_part = page_template.template_parts.find_by_code(code)
+        if type == "menu" && name.to_s.empty?
+          template_part = nil
+          template_part = page_template.template_parts.find_by_code(page_template.menu) if template_part.nil? && page_template.menu.present?
+          template_part = page_template.template_parts.where(part_type: 'menu').order(:name).first if template_part.nil?
+        else
+          template_part = page_template.template_parts.find_by_code(code)
+        end
 
 
         if template_part
         if template_part
           html = TemplateGenerator::subpart_generate(session, domain, page_template, template_part.part_type, template_part.elements)
           html = TemplateGenerator::subpart_generate(session, domain, page_template, template_part.part_type, template_part.elements)
@@ -93,9 +99,9 @@ module Kanjai
       end
       end
       
       
       (0..1).each do |index|
       (0..1).each do |index|
-        layer.scan(/(<element name="([\w\W]+?)"><\/element>)/).each do |item|
+        layer.scan(/(<element name="([\w\W]*?)"><\/element>)/).each do |item|
           content = item[0]
           content = item[0]
-          name = item[1]
+          name = item[1].to_s
           code = name.parameterize
           code = name.parameterize
 
 
           template_part = page_template.template_parts.find_by_code(code)
           template_part = page_template.template_parts.find_by_code(code)

@@ -78,9 +78,8 @@ module Kanjai
       if page_template
       if page_template
         subpart = page_template.template_parts.where(code: page_content.type_content).first
         subpart = page_template.template_parts.where(code: page_content.type_content).first
         if subpart
         if subpart
-          p '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
           markers_position = {}
           markers_position = {}
-          subpart.field_options.each_with_index do |item, index|
+          subpart.field_options.sort_by{|item| item[:name] }.each_with_index do |item, index|
             markers_position[item[:name]] = index + 1
             markers_position[item[:name]] = index + 1
           end
           end
           
           

@@ -12,6 +12,12 @@
   </div>                
   </div>                
 
 
 
 
+  <div class="form-group">
+    <%= f.label :menu, Kanjai::PageTemplate.human_attribute_name(:menu), class: 'col-form-label' %>
+    <%= f.select :menu, @page_template.template_parts.where(part_type: 'menu').order(:name).collect{|item| [item.name, item.code]}, {include_blank: true}, class: "form-control #{@page_template.errors.include?(:menu) ? 'parsley-error' : ''} " %>
+    <%= error_messages(@page_template, :menu) %>
+  </div>                
+
   <fieldset>
   <fieldset>
     <div class="form-group row">
     <div class="form-group row">
       <%= f.label :attachment_file_name, Kanjai::PageTemplate.human_attribute_name(:attachment), :class => "col-md-2 col-form-label" %>
       <%= f.label :attachment_file_name, Kanjai::PageTemplate.human_attribute_name(:attachment), :class => "col-md-2 col-form-label" %>

+class AddMenuToPageTemplate < ActiveRecord::Migration[5.2]
+  def change
+    add_column :kanjai_templates, :menu, :string
+  end
+end

 module Kanjai
 module Kanjai
-  VERSION = "0.0.246"
+  VERSION = "0.0.247"
 end
 end