alchemy-custom-model 3.0.0 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc513864d0af1d5cd7f41920d50b2c0c5ce7fdb5e7dcd499cba0133b1c6b2370
-  data.tar.gz: 0c48c0bb5aff124b19f19db0c943295d2e5081cb770137b218c121012039a9cb
+  metadata.gz: '028e68c8f085f2edc86ab9d40205c603f9118c033aa2cc33f7e5f7762e787a6f'
+  data.tar.gz: b617c1996d2f3632f6175c2641641ea8794235bac8709a1a93887a51e94787e4
 SHA512:
-  metadata.gz: c252ab1b1bbcd71b7681b4f9310049f5517b328e71df390cf63530f5cb3e76e4da023a630ed23a312cf3cd02f2ab1c2e86abe85b584e65eec44a66204001a0a6
-  data.tar.gz: 3c06811e1ec6d0ea5b747cdf0ea89e5119f8db87e9c384e7a6bfa31bcf51d30c058fe4e6fdf183eff4d3688e0c50c9fd12c9a465dfa18a279bda6445d94c9357
+  metadata.gz: 2ffc392f726016cfd74bbd8c96159323d36889eacdf4919b37b0a9bc5c8215d9e27d6736fd4b6131596ad6f1d4178d4fd110442800234c812cbccdc3c8571390
+  data.tar.gz: 53e285be0a561da95d43c4a6f1bf434541c66e08965e0abcb299f270a1d02f5d6b9f88edde209da9c6463e99c240e76ed49186f07a9308e84d70cd698d0fef1b

data/app/controllers/concerns/alchemy/admin/nodes_controller_dec.rb

@@ -44,7 +44,8 @@ module Alchemy
               :nofollow,
               :external,
               :custom_model_klass,
-              :custom_model_method
+              :custom_model_method,
+              :menu_type
           )
         end
 

data/app/helpers/alchemy/custom/model/admin/base_helper.rb

@@ -392,7 +392,7 @@ module Alchemy::Custom::Model::Admin::BaseHelper
 
   def order_path(obj = nil, options = {})
     if obj.nil?
-      new_polymorphic_path([:admin, base_class.to_s.pluralize.underscore, :order])
+      new_polymorphic_path([:admin, base_class.to_s.pluralize.underscore.to_sym, :order])
     else
       new_polymorphic_path([:admin, obj, :order])
     end

data/app/helpers/alchemy/pages_helper_decorator.rb

@@ -110,14 +110,14 @@ Alchemy::PagesHelper.module_eval do
   end
 
   def render_menu_with_language(name, options = {})
-    root_node = Alchemy::Node.where(language_id: Alchemy::Language.current.id).roots.find_by(name: name)
+    root_node = Alchemy::Node.where(language_id: Alchemy::Language.current.id).roots.find_by(menu_type: name)
     if root_node.nil?
       warning("Menu with name #{name} not found!")
       return
     end
 
     options = {
-        node_partial_name: "#{root_node.view_folder_name}/node"
+      node_partial_name: "#{root_node.to_partial_path}"
     }.merge(options)
 
     render(root_node, menu: root_node, node: root_node, options: options)

data/app/views/alchemy/admin/nodes/_form.html.erb

@@ -1,75 +1,57 @@
 <%= alchemy_form_for([:admin, node]) do |f| %>
+  <% if node.new_record? && node.root? %>
+    <%= f.input :menu_type,
+                collection: Alchemy::Language.current.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] },
+                include_blank: false,
+                input_html: { class: 'alchemy_selectbox' } %>
 
-  <% if node.root? %>
-
-    <% if Alchemy::Node.respond_to? :available_menu_names %>
-      <%= f.input :name,
-                  collection: Alchemy::Node.available_menu_names.map { |n| [I18n.t(n, scope: [:alchemy, :menu_names]), n] },
-                  include_blank: false,
-                  input_html: {class: 'alchemy_selectbox'} %>
+  <% else %>
+    <% if node.root? %>
+      <%= f.input :name %>
     <% else %>
       <%= f.input :name, input_html: {
-          autofocus: true,
-          value: node.page && node.read_attribute(:name).blank? ? nil : node.name,
-          placeholder: node.page ? node.page.name : nil
-      } %>
-    <% end %>
-
-  <% else %>
-
-    <%= f.input :name, as: :string,  input_html: {
         autofocus: true,
         value: node.page && node.read_attribute(:name).blank? ? nil : node.name,
         placeholder: node.page ? node.page.name : nil
-    } %>
-
-    <%
-      active_klass = (node.errors.keys.include? :custom_model_klass or
+      } %>
+      <%
+        active_klass = (node.errors.keys.include? :custom_model_klass or
           node.custom_model?) ? "ui-tabs-active" : ""
-    %>
+      %>
+
+      <div class="container_selctor_age_custom_model">
+        <div id="tabs_nodes" class="ui-tabs ui-corner-all ui-widget ui-widget-content">
+          <ul role="tablist" class="ui-tabs-nav ui-corner-all ui-helper-reset ui-helper-clearfix ui-widget-header">
+            <li role="tab" tabindex="0" class="ui-tabs-tab ui-corner-top ui-state-default ui-tab">
+              <a href="#pages" role="presentation" tabindex="-1" class="ui-tabs-anchor" id="ui-id-1">
+                <%= Alchemy.t(:pages_select) %>
+              </a>
+            </li>
+            <li role="tab" tabindex="1" class="ui-tabs-tab ui-corner-top ui-tab <%= active_klass %>">
+              <a href="#custom_models" role="presentation" tabindex="1" class="ui-tabs-anchor" id="ui-id-2">
+                <%= Alchemy.t(:custom_models) %>
+              </a>
+            </li>
+          </ul>
+          <div id="custom_models" aria-labelledby="legacy_urls_label" role="tabpanel" class="ui-tabs-panel ui-corner-bottom ui-widget-content" aria-hidden="false">
+            <%= f.input :custom_model_klass, input_html: {class: 'alchemy_selectbox'} %>
+            <%= f.input :custom_model_method, input_html: {class: 'alchemy_selectbox'} %>
+          </div>
+          <div id="pages" aria-labelledby="ui-id-1" role="tabpanel" class="ui-tabs-panel ui-corner-bottom ui-widget-content" aria-hidden="false">
+            <%= f.input :page_id, label: Alchemy::Page.model_name.human, input_html: {class: 'alchemy_selectbox'} %>
+            <%= f.input :url, input_html: {disabled: node.page}, hint: Alchemy.t(:node_url_hint) %>
+            <%= f.input :title %>
+            <%= f.input :nofollow %>
+            <%= f.input :external %>
+            <%= f.hidden_field :parent_id %>
+          </div>
 
-    <div class="container_selctor_age_custom_model">
-      <div id="tabs_nodes" class="ui-tabs ui-corner-all ui-widget ui-widget-content">
-        <ul role="tablist" class="ui-tabs-nav ui-corner-all ui-helper-reset ui-helper-clearfix ui-widget-header">
-          <li role="tab" tabindex="0" class="ui-tabs-tab ui-corner-top ui-state-default ui-tab">
-            <a href="#pages" role="presentation" tabindex="-1" class="ui-tabs-anchor" id="ui-id-1">
-            <%= Alchemy.t(:pages_select) %>
-            </a>
-          </li>
-          <li role="tab" tabindex="1" class="ui-tabs-tab ui-corner-top ui-tab <%= active_klass %>">
-            <a href="#custom_models" role="presentation" tabindex="1" class="ui-tabs-anchor" id="ui-id-2">
-              <%= Alchemy.t(:custom_models) %>
-            </a>
-          </li>
-        </ul>
-        <div id="custom_models" aria-labelledby="legacy_urls_label" role="tabpanel" class="ui-tabs-panel ui-corner-bottom ui-widget-content" aria-hidden="false">
-          <%= f.input :custom_model_klass, input_html: {class: 'alchemy_selectbox'} %>
-          <%= f.input :custom_model_method, input_html: {class: 'alchemy_selectbox'} %>
-        </div>
-        <div id="pages" aria-labelledby="ui-id-1" role="tabpanel" class="ui-tabs-panel ui-corner-bottom ui-widget-content" aria-hidden="false">
-          <%= f.input :page_id, label: Alchemy::Page.model_name.human, input_html: {class: 'alchemy_selectbox'} %>
-          <%= f.input :url, input_html: {disabled: node.page}, hint: Alchemy.t(:node_url_hint) %>
-          <%= f.input :title %>
-          <%= f.input :nofollow %>
-          <%= f.input :external %>
-          <%= f.hidden_field :parent_id %>
         </div>
-
       </div>
-    </div>
-
-
-
-
 
-
-  <% end %>
-  <% if node.respond_to? :site_id %>
-    <%= f.hidden_field :site_id %>
-  <% end %>
-  <% if node.respond_to? :language_id %>
-    <%= f.hidden_field :language_id %>
+    <% end %>
   <% end %>
+  <%= f.hidden_field :language_id %>
   <%= f.submit button_label %>
 <% end %>
 
@@ -102,7 +84,6 @@
 
     })
 
-    $('#node_custom_model_method').select2('disable');
 
     $('#node_page_id').alchemyPageSelect({
         placeholder: "<%= Alchemy.t(:search_page) %>",
@@ -111,16 +92,16 @@
         initialSelection: {
             id: <%= node.page_id %>,
             text: "<%= node.page.name %>",
-            url: "/<%= node.page.urlname %>"
+            url_path: "<%= node.page.url_path %>"
         }
         <% end %>
-    }).on('change', function (e) {
+    }).on('change', function(e) {
         if (e.val === '') {
             $('#node_name').removeAttr('placeholder')
             $('#node_url').val('').prop('disabled', false)
         } else {
             $('#node_name').attr('placeholder', e.added.name)
-            $('#node_url').val('/' + e.added.urlname).prop('disabled', true)
+            $('#node_url').val(e.added.url_path).prop('disabled', true)
         }
     })
 </script>

data/app/views/alchemy/custom/model/admin/base/index.html.erb

@@ -31,22 +31,22 @@
     }
   end
 
-  if can?(:export_csv, base_class) and check_presence_polymorphic_path([:export_csv, :admin,  base_class.to_s.demodulize.pluralize.underscore ], :get, format: :csv)
+  if can?(:export_csv, base_class) and check_presence_polymorphic_path([:export_csv, :admin,  base_class.to_s.demodulize.pluralize.underscore.to_sym ], :get, format: :csv)
     buttons << {
         icon: "download",
         label: t(:export_selected_data),
-        url: polymorphic_path([:export_csv, :admin,  base_class.to_s.demodulize.pluralize.underscore], {format: :csv}.merge(request.query_parameters) ),
+        url: polymorphic_path([:export_csv, :admin,  base_class.to_s.demodulize.pluralize.underscore.to_sym], {format: :csv}.merge(request.query_parameters) ),
         title: t(:export_selected_data),
         dialog: false,
         if_permitted_to: [:export_csv, base_class]
     }
   end
 
-  if can?(:export_csv_full, base_class) and check_presence_polymorphic_path([:export_csv_full, :admin,  base_class.to_s.demodulize.pluralize.underscore ], :get, format: :csv)
+  if can?(:export_csv_full, base_class) and check_presence_polymorphic_path([:export_csv_full, :admin,  base_class.to_s.demodulize.pluralize.underscore.to_sym ], :get, format: :csv)
     buttons << {
         icon: "file-archive",
         label: t(:export_all_data),
-        url: polymorphic_path([:export_csv_full, :admin,  base_class.to_s.demodulize.pluralize.underscore],format: :csv),
+        url: polymorphic_path([:export_csv_full, :admin,  base_class.to_s.demodulize.pluralize.underscore.to_sym],format: :csv),
         title: t(:export_all_data),
         dialog: false,
         if_permitted_to: [:export_csv_full, base_class]

data/lib/alchemy/custom/model/version.rb

@@ -1,7 +1,7 @@
 module Alchemy
   module Custom
     module Model
-      VERSION = '3.0.0'
+      VERSION = '3.1.3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-custom-model
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.3
 platform: ruby
 authors:
 - Alessandro Baccanelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms