alchemy-custom-model 2.2.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 350f7cabcafa4b2c45d4a22ba2ee23c2bd58c719f622cc1619cba29d8934bb2f
-  data.tar.gz: 9f43ce7df02880061330222c666ac4eac99e301a3dbd2494cc6232f40167e644
+  metadata.gz: 55c17f5ce203eedbd4ad364be3ed1302d1d4dd7d4216613238e844e0ed5fabee
+  data.tar.gz: 546fdbb3be926f0e8a32fd6e03dd9bff4abcc8c4a6fc359b81af0fa1323ee59a
 SHA512:
-  metadata.gz: 58992f001577a2b87264e88e2e7c15f6c03bd9a7c112b100f1acf054a4355fe1d18c6e142742de7a995bfa742d68661f052571b43c6e0fec0cb6f45418aa9595
-  data.tar.gz: e218a09bc0dec11be4747c658622e583593b086486490e3bf34cfcab8652f95915d122325e861a48c09cde9e61686f69b499471b92d3a2dfe72a29aec7a15f03
+  metadata.gz: 167b7b826b42af9a46bd7c35f790afca9cabeb5557166f6823bc3303974137000f3ead2b6f8f8934c5477f6d8d8e3d421fe28d476d14b65c28857a4fcf91e92e
+  data.tar.gz: 638a5b8b4d714ce849501652cf47f4cb7e715006aea25d596713d6f743bcf40d4a3bc68b6eac051462da7fefd18d998072f475879fcdc350ebd906b461052101

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/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/el_finder/paths/active_record_reference.rb

@@ -35,6 +35,15 @@ module Alchemy::Custom::Model::ElFinder
           "#{p.id}#{URI_SPACER}"
         end
 
+        ##
+        # Identifichiamo la data di modifica del file con la data di modifica del record, in questo modo la cache
+        # che viene generata attraverso l'inserimento di un parametro nella query con il valore t=orario non andrà ad essere
+        # aggiornato ad ogni refresh, anche solo a livello di browser
+        # nel caso abbiamo problemi usiamo lo standard
+        def mtime
+          active_record_instance.updated_at rescue super
+        end
+
         def file
           active_record_instance.file
         end

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

@@ -1,7 +1,7 @@
 module Alchemy
   module Custom
     module Model
-      VERSION = '2.2.1'
+      VERSION = '3.1.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-custom-model
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Alessandro Baccanelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement