alchemy-custom-model 2.1.2 → 3.1.0

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

@@ -1,4 +1,9 @@
-<div class="gallery_item_blk">
-  <%= image_tag(picture.image_file.thumb("100x100#").url) %>
+<div class="gallery_item_blk" data-id="<%= jr_id %>">
+  <%= image_tag(picture.image_file.thumb("140x140#").url) %>
   <%= yield if block_given? %>
+  <div class="command_area">
+    <div class="destroy">
+      <i class="fas fa-times fa-lg fa-fw"></i>
+    </div>
+  </div>
 </div>

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

@@ -0,0 +1,16 @@
+<%= search_panel do |form| %>
+
+  <span>Ovverride with personalized ransack fields</span>
+  <div class="row">
+    form.input :field1_i_cont <br/>
+    form.input :field2_i_cont <br/>
+    form.input :field3_i_cont <br/>
+  </div>
+
+  <div class="row">
+    form.input :field4_i_cont <br/>
+    form.input :field5_i_cont <br/>
+    form.input :field6_i_cont <br/>
+  </div>
+
+<% end %>

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

@@ -1,8 +1,8 @@
 <fieldset>
   <legend><%= t(:seo_fields)%></legend>
-  <%= f.input :meta_title %>
-  <%= f.input :meta_description %>
-  <%= f.input :meta_keywords %>
-  <%= f.input :robot_follow %>
-  <%= f.input :robot_index %>
+  <%= f.input :meta_title, as: :string %>
+  <%= f.input :meta_description, as: :text%>
+  <%= f.input :meta_keywords, as: :text %>
+  <%= f.input :robot_follow, as: :boolean %>
+  <%= f.input :robot_index, as: :boolean %>
 </fieldset>

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

@@ -0,0 +1,30 @@
+<%=toolbar(
+     buttons: [
+       {
+         icon: "angle-double-left ",
+         label: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
+         url: polymorphic_path(url_namespace),
+         title: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
+         hotkey: 'alt+b',
+         dialog: false,
+         if_permitted_to: [:index, @obj.class]
+       }
+
+     ],
+     search: false
+   ) %>
+
+
+<div class="show_page">
+  <% @obj.attributes.each do |attribute| %>
+    <div class="attribute_row">
+      <div class="labelfield">
+        <%= @obj.class.human_attribute_name(attribute.first.to_sym) %>
+      </div>
+      <div class="valuefield">
+        <%= attribute[1]  %>
+      </div>
+    </div>
+  <% end %>
+  
+</div>

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

@@ -0,0 +1,48 @@
+<%
+  buttons = []
+
+  buttons << {
+      icon: "angle-double-left ",
+      label: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
+      url: polymorphic_path(url_namespace),
+      title: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
+      hotkey: 'alt+b',
+      dialog: false,
+      if_permitted_to: [:index, @obj.class]
+  }
+
+  if exist_order_path? @obj
+    buttons << {
+        icon: :random,
+        label: acm_t(:title_action, action: acm_t(:order, scope: :actions), model: base_class.model_name.human),
+        url: order_path(@obj),
+        title: acm_t(:title_action, action: acm_t(:order, scope: :actions), model: base_class.model_name.human),
+        hotkey: 'alt+n',
+        dialog: false,
+        if_permitted_to: [:order, base_class]
+    }
+  end
+
+%>
+
+
+<% toolbar(
+       buttons: buttons,
+       search: false
+   ) %>
+
+
+<%= base_container do %>
+
+  <div id="archive_all" class="resources-table-wrapper">
+
+    <%= content_tag :h1, "#{@objects.count} #{base_class.model_name.human(count: @objects.count)}", class: 'resources-header' %>
+
+
+    <%= render partial: "table" %>
+
+    <%= paginate @objects, theme: 'alchemy', hide_per_page_select: true %>
+
+  </div>
+
+<% end %>

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

@@ -1,3 +1,3 @@
 <h1>
-  <%= t(:title_action, action: t(action_name, scope: :actions), model: base_class.model_name.human) %>
+  <%= acm_t(:title_action, action: acm_t(action_name, scope: :actions), model: base_class.model_name.human) %>
 </h1>

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

@@ -2,9 +2,9 @@
      buttons: [
        {
          icon: "angle-double-left ",
-         label: t(:title_action, action: t(:index, scope: :actions), model: base_class.model_name.human),
+         label: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
          url: polymorphic_path(url_namespace),
-         title: t(:title_action, action: t(:index, scope: :actions), model: base_class.model_name.human),
+         title: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
          hotkey: 'alt+b',
          dialog: false,
          if_permitted_to: [:index, @obj.class]

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.downcase.pluralize ], :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.downcase.pluralize],format: :csv),
+        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.downcase.pluralize ], :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.downcase.pluralize],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]
@@ -65,8 +65,9 @@
 
   <div id="archive_all" class="resources-table-wrapper">
 
-    <%= content_tag :h1, "#{@objects.count} #{base_class.model_name.human(count: @objects.count)}", class: 'resources-header' %>
+    <%= content_tag :h1, "#{@total_objects.count} #{base_class.model_name.human(count: @objects.count)}", class: 'resources-header' %>
 
+    <%= render partial: "search_panel" %>
 
     <%= render partial: "table" %>
 

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

@@ -2,9 +2,9 @@
      buttons: [
        {
          icon: "angle-double-left ",
-         label: acm_t(:title_action, action: t(:index, scope: :actions), model: base_class.model_name.human),
+         label: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
          url: polymorphic_path(url_namespace),
-         title: acm_t(:title_action, action: t(:index, scope: :actions), model: base_class.model_name.human),
+         title: acm_t(:title_action, action: acm_t(:index, scope: :actions), model: base_class.model_name.human),
          hotkey: 'alt+b',
          dialog: false,
          if_permitted_to: [:index, @obj.class]

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

@@ -1,48 +1,5 @@
-<%
-  buttons = []
-
-  buttons << {
-      icon: "angle-double-left ",
-      label: acm_t(:title_action, action: t(:index, scope: :actions), model: base_class.model_name.human),
-      url: polymorphic_path(url_namespace),
-      title: acm_t(:title_action, action: t(:index, scope: :actions), model: base_class.model_name.human),
-      hotkey: 'alt+b',
-      dialog: false,
-      if_permitted_to: [:index, @obj.class]
-  }
-
-  if exist_order_path? @obj
-    buttons << {
-        icon: :random,
-        label: acm_t(:title_action, action: acm_t(:order, scope: :actions), model: base_class.model_name.human),
-        url: order_path(@obj),
-        title: acm_t(:title_action, action: acm_t(:order, scope: :actions), model: base_class.model_name.human),
-        hotkey: 'alt+n',
-        dialog: false,
-        if_permitted_to: [:order, base_class]
-    }
-  end
-
-%>
-
-
-<% toolbar(
-       buttons: buttons,
-       search: false
-   ) %>
-
-
-<%= base_container do %>
-
-  <div id="archive_all" class="resources-table-wrapper">
-
-    <%= content_tag :h1, "#{@objects.count} #{base_class.model_name.human(count: @objects.count)}", class: 'resources-header' %>
-
-
-    <%= render partial: "table" %>
-
-    <%= paginate @objects, theme: 'alchemy', hide_per_page_select: true %>
-
-  </div>
-
-<% end %>
+<% if @objects.nil? %>
+  <%= render partial: "show_object" %>
+<% else %>
+  <%= render partial: "show_objects" %>
+<% end %>

data/app/views/alchemy/pages/sitemap.xml.erb

@@ -0,0 +1,16 @@
+<%- @pages.each do |page| -%>
+<url>
+  <loc><%= show_alchemy_page_url(page) %></loc>
+  <lastmod><%= page.updated_at.utc.iso8601 %></lastmod>
+  <changefreq><%= Alchemy::Custom::Model.sitemap_change_freq %></changefreq>
+</url>
+<%- end -%>
+<% Alchemy::Language.published.each do |language| %>
+<% @custom_elements.each do |ce| %>
+<url>
+  <loc><%= custom_model_url(ce, language: language) %></loc>
+  <lastmod><%= ce.updated_at.utc.iso8601 %></lastmod>
+  <changefreq><%= Alchemy::Custom::Model.sitemap_change_freq %></changefreq>
+</url>
+<% end %>
+<% end%>

data/config/locales/it.yml

@@ -19,3 +19,9 @@ it:
       minimize_all: Minimizza
       maxzimize_all: Massimizza
 
+    image_used_in_this_models: Immagine usata nei seguenti modelli
+
+  alchemy:
+    custom_models: Custom Models
+    pages_select: Pagine
+

data/config/routes.rb

@@ -6,3 +6,19 @@ Alchemy::Custom::Model::Engine.routes.draw do
   end
 
 end
+
+
+Alchemy::Engine.routes.draw do
+
+  if "Alchemy::Node".safe_constantize
+    namespace :admin do
+      resources :nodes do
+        collection do
+          get :custom_models, defaults: {format: 'json'}, constraints: {format: :json}
+          get :custom_models_methods, defaults: {format: 'json'}, constraints: {format: :json}
+        end
+      end
+    end
+  end
+end
+

data/db/migrate/20200424184007_add_fields_to_node.rb

@@ -0,0 +1,8 @@
+class AddFieldsToNode < ActiveRecord::Migration[5.2]
+  def change
+    if "Alchemy::Node".safe_constantize
+      add_column :alchemy_nodes, :custom_model_klass, :string
+      add_column :alchemy_nodes, :custom_model_method, :string
+    end
+  end
+end

data/lib/alchemy/custom/model.rb

@@ -0,0 +1,58 @@
+require "alchemy_cms"
+require "jquery/ui/rails"
+require "el_finder"
+require "friendly_id"
+require "globalize"
+require 'friendly_id/globalize'
+require "active_type"
+require "alchemy/custom/model/engine"
+
+
+module Alchemy
+  extend ActiveSupport::Autoload
+  autoload :NodeDec
+
+  module Admin
+    extend ActiveSupport::Autoload
+    autoload :NodesControllerDec
+  end
+
+
+  module Custom
+    module Model
+      extend ActiveSupport::Autoload
+
+      autoload :ElFinder
+      autoload :GlobalIdSetter
+      autoload :MenuMethods
+      autoload :SlugOptimizer
+      autoload :ModelDecoration
+      autoload :TranslationScope
+      autoload :PagesControllerDec
+      autoload :PictureUsedBy
+      autoload :ModelUtilsMethod
+      autoload :SitemapMethods
+      autoload :GlobalizeModelDecoration
+
+
+      mattr_accessor :sitemap_change_freq
+      @@sitemap_change_freq = "weekly"
+
+      mattr_accessor :sitemaps_models
+      @@sitemaps_models = []
+
+
+      mattr_accessor :base_admin_controller_class
+
+      @@base_admin_controller_class = 'Alchemy::Admin::BaseController'
+
+      mattr_accessor :allowed_custom_models_for_menu
+      @@allowed_custom_models_for_menu = []
+
+
+      def self.admin_controller_class
+        @@base_admin_controller_class.constantize
+      end
+    end
+  end
+end

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/engine.rb

@@ -20,9 +20,15 @@ module Alchemy
 
           Alchemy::PagesController.include(PagesControllerDec)
 
+
+          if "Alchemy::Node".safe_constantize
+              Alchemy::Node.include Alchemy::NodeDec
+              Alchemy::Admin::NodesController.include Alchemy::Admin::NodesControllerDec
+          end
+
           # load degli helpers per alchemy
           [
-            Alchemy::Custom::Model::Engine.root.join('app', 'helpers', 'alchemy', 'pages_helper_decorator.rb')
+              Alchemy::Custom::Model::Engine.root.join('app', 'helpers', 'alchemy', 'pages_helper_decorator.rb')
           ].each do |f|
             Rails.configuration.cache_classes ? require(f) : load(f)
           end

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

@@ -0,0 +1,26 @@
+module Alchemy::Custom::Model
+  module GlobalizeModelDecoration
+    extend ActiveSupport::Concern
+
+    included do
+
+      include GlobalIdSetter
+      include MenuMethods
+      include ModelUtilsMethods
+      include SitemapMethods
+
+
+
+      def self.use_friendly(base = nil, options = {}, &block)
+        extend FriendlyId
+
+        self.friendly_id(base, options.merge(use: [:globalize]), &block)
+
+        include SlugOptimizer
+
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,16 @@
+module Alchemy
+  module Custom
+    module Model
+      module MenuMethods
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          class_attribute :menu_generator_methods, default: []
+
+        end
+      end
+    end
+  end
+end