alchemy-custom-model 3.1.2 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55c17f5ce203eedbd4ad364be3ed1302d1d4dd7d4216613238e844e0ed5fabee
-  data.tar.gz: 546fdbb3be926f0e8a32fd6e03dd9bff4abcc8c4a6fc359b81af0fa1323ee59a
+  metadata.gz: 0fc385ac1ddd09464a96c5aa3c9f8b8cbe58c4987e7febd91efd2654b4b2506f
+  data.tar.gz: 6d95f7b6a019fb7c378eb7dd700a42454dc6c0bea2326444c99db50171cfcae6
 SHA512:
-  metadata.gz: 167b7b826b42af9a46bd7c35f790afca9cabeb5557166f6823bc3303974137000f3ead2b6f8f8934c5477f6d8d8e3d421fe28d476d14b65c28857a4fcf91e92e
-  data.tar.gz: 638a5b8b4d714ce849501652cf47f4cb7e715006aea25d596713d6f743bcf40d4a3bc68b6eac051462da7fefd18d998072f475879fcdc350ebd906b461052101
+  metadata.gz: 6e3c0d0715ed7e6b488072e7324058d47bb57b391c0bd7367daa784efe39db4d08edb489f20b4576f09273fb913b160813c11bb7d9e223f0b73d4006c150046f
+  data.tar.gz: 604abd0732a5f9b910bf9b8327d9c7841d7c91c72eb21e688ac9cfdc7e603d499c6fc8aa5acd038041e9ad9327ec6409613ec09275d7b0df082c0c57a21c59bb

data/app/assets/stylesheets/alchemy-custom-model/custom_style.css.scss

@@ -370,4 +370,24 @@
     }
 
   }
+}
+
+
+.gallery_item_blk {
+  .overlay-hover {
+    display: none;
+    position: absolute;
+    padding: 5px;
+    top: 0;
+    left: 0;
+    color: white;
+    background: rgba( #000, .4 );
+    width: 100%;
+    height: 100%;
+  }
+  &:hover {
+    .overlay-hover {
+      display: block;
+    }
+  }
 }

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

@@ -221,7 +221,7 @@ module Alchemy::Custom::Model::Admin::BaseHelper
           component_id = SecureRandom.hex(10)
 
           bf << form.fields_for(field) do |join_record_form|
-            render(layout: 'gallery_item', locals: {picture: join_record_form.object.picture, jr_id: join_record_form.object.id}) do
+            render(layout: 'gallery_item', locals: {picture: join_record_form.object.picture, jr: join_record_form.object}) do
               sb = ActiveSupport::SafeBuffer.new
 
               sb << join_record_form.hidden_field(:position, class: 'gallery_position_counter')

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

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

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/custom/model/admin/base/_gallery_item.html.erb

@@ -1,9 +1,42 @@
-<div class="gallery_item_blk" data-id="<%= jr_id %>">
+
+<% obj = jr.metadata_record(locale) %>
+<div class="gallery_item_blk" data-id="<%= jr.id %>">
   <%= image_tag(picture.image_file.thumb("140x140#").url) %>
+  <% unless obj.nil? %>
+    <div class="overlay-hover">
+      <% unless obj.title.blank? %>
+        <%= t('activerecord.attributes.selling_point_picture_metadatum.title') %>: <%= obj.title %>
+        <br/>
+      <% end %>
+      <% unless obj.alternative_text.blank? %>
+        <%= t('activerecord.attributes.selling_point_picture_metadatum.alternative_text') %>
+        : <%= obj.alternative_text %>
+        <br/>
+      <% end %>
+      <% unless obj.caption.blank? %>
+        <%= t('activerecord.attributes.selling_point_picture_metadatum.caption') %>: <%= obj.caption %>
+      <% end %>
+    </div>
+  <% end %>
   <%= yield if block_given? %>
   <div class="command_area">
+    <% if not obj.nil? %>
+      <%
+        if obj.persisted?
+          url = edit_polymorphic_path([:admin, obj], :spp_id => jr.id)
+        else
+          url = new_polymorphic_path([:admin, obj], :spp_id => jr.id)
+        end
+      %>
+      <%= link_to_dialog render_icon(:edit), url, {  }, title: Alchemy.t(:edit_image_properties) %>
+    <% end %>
     <div class="destroy">
       <i class="fas fa-times fa-lg fa-fw"></i>
     </div>
   </div>
 </div>
+
+
+
+
+

data/lib/alchemy/custom/model/el_finder/paths/file.rb

@@ -3,7 +3,7 @@ module Alchemy::Custom::Model::ElFinder
     class File < ActiveRecordReference
 
       def full_fill_paylod(payload)
-        payload[:original_url] = ::Alchemy::Engine.routes.url_helpers.download_attachment_path(id: active_record_instance.id, name: active_record_instance.urlname)
+        payload[:original_url] = ::Alchemy::Engine.routes.url_helpers.download_attachment_path(id: active_record_instance.id, name: active_record_instance.slug)
         payload
       end
 

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

@@ -8,6 +8,7 @@ module Alchemy::Custom::Model
       include MenuMethods
       include SlugOptimizer
       include SitemapMethods
+      include PicturesAltMethods
 
       belongs_to :language, class_name: "Alchemy::Language"
 

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

@@ -0,0 +1,28 @@
+module Alchemy
+  module Custom
+    module Model
+      module PicturesAltMethods
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          def metadata_relation
+            # TO BE OVERRIDED WITH HAS_MANY RELATION OF METADATA MODEL SYMBOL
+            nil
+          end
+
+          def metadata_record(language_code)
+            if metadata_relation.nil?
+              nil
+            else
+              self.send(metadata_relation).joins(:language).
+                where(alchemy_languages: { language_code: language_code }).first_or_initialize
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-custom-model
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: '3.2'
 platform: ruby
 authors:
 - Alessandro Baccanelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -238,6 +238,7 @@ files:
 - lib/alchemy/custom/model/order.rb
 - lib/alchemy/custom/model/pages_controller_dec.rb
 - lib/alchemy/custom/model/picture_used_by.rb
+- lib/alchemy/custom/model/pictures_alt_methods.rb
 - lib/alchemy/custom/model/sitemap_methods.rb
 - lib/alchemy/custom/model/slug_optimizer.rb
 - lib/alchemy/custom/model/translation_scope.rb