alchemy-custom-model 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 18dbecf67db40ed24197196da81d783276e051fd
-  data.tar.gz: e621f92260133cd31d1636c4b5a2ae4e4d173e78
+SHA256:
+  metadata.gz: 1a2697b7c047652bd81eff2eea2f6ce536f17b636ee6e200fa0d79de57183544
+  data.tar.gz: b6463926d7a0e7dec5a118fe74fc71a92293a46eba4bec350f3f5ca454c1ad6e
 SHA512:
-  metadata.gz: f555a7ffc0e4e0eb68cc1b8b79e6b60ad7f60f29490c505d3270b4d99b625da384b775027d6ab317b0ba9c39410740d51f190c4a08e1967bfdb50c061f0a92b1
-  data.tar.gz: 8a0779d78372fb4c2f39a5123572ca752b22085e4309545399ba9a51fcc07e9bbbd1be87cfefd3d37f3b609c8c3202457cf90cdd8c3eb4976eaf2abcbfe66bb0
+  metadata.gz: f5252ad81308db97abf919cc87dc6e7c70031f4f8a4ece43aa8776458bc39723d1dfafce7dcb92a0d15b8bbc7bd81ec553f691e5f052a2ab5bc33fbff30c1e8f
+  data.tar.gz: f818915cbacb6cc271954c4aa5f57cae5bf67ff56cce88c2c997eb057e6cf8f13ce30ac7d6332f9f5b42da1b23810574b0bfa1e8c25d49362d02eefbbfbb34a4

data/app/assets/javascripts/alchemy-custom-model/alchemy_custom_model_select.js

@@ -0,0 +1,62 @@
+$.fn.alchemyCustomModelSelect = function(options) {
+
+    return this.select2({
+        placeholder: options.placeholder,
+        allowClear: true,
+        initSelection: function(element, callback) {
+            console.log("pippo")
+            var id = $(element).val();
+            console.log(id)
+            if (id !== "") {
+                var q = {}
+                if (options.query_params){
+                    q = options.query_params()
+                }
+                $.ajax(options.url, {
+                    dataType: "json",
+                    data: {
+                        id: id,
+                        q: q,
+                        per_page: 3000
+                    }
+                }).done(function(data) {
+                    var el = null
+                    $.each(data.results, function(index,element){
+                        if (element.text == id){
+
+                            el = element
+                        }
+                    })
+                    callback(el);
+                });
+            }
+        },
+        ajax: {
+            url: options.url,
+            datatype: 'json',
+            quietMillis: 300,
+            data: function (term, page) {
+                var extend_query_params = {}
+                if (options.query_params) {
+
+                    extend_query_params =  options.query_params(term,page)
+
+                }
+                return {
+                    q: $.extend({
+                        name: term
+                    }, extend_query_params),
+                    page: page
+                }
+            },
+            results: function (data) {
+                var meta = data.meta
+                return {
+                    results: data.results,
+                    more: meta.page * meta.per_page < meta.total_count
+                }
+            }
+         },
+
+    })
+}

data/app/assets/javascripts/alchemy-custom-model/common_init.js

@@ -1,16 +1,19 @@
-$(document).on("'page:change turbolinks:load", function(){
-    $(".datepicker-date").datetimepicker({
-        scrollInput: false,
-        format: "d/m/Y",
-        timepicker: false,
-        datepicker: true,
-        dayOfWeekStart: 0
-    })
+$(document).on("'page:change turbolinks:load", function () {
 
-    $(".datepicker-time").datetimepicker({
-        format:'H:i',
-        timepicker: true,
-        datepicker: false,
-        step: 15
-    })
+    if ($.isFunction("datetimepicker")) {
+        $(".datepicker-date").datetimepicker({
+            scrollInput: false,
+            format: "d/m/Y",
+            timepicker: false,
+            datepicker: true,
+            dayOfWeekStart: 0
+        })
+
+        $(".datepicker-time").datetimepicker({
+            format: 'H:i',
+            timepicker: true,
+            datepicker: false,
+            step: 15
+        })
+    }
 });

data/app/assets/javascripts/alchemy-custom-model/el_finder.js.coffee.erb

@@ -196,8 +196,26 @@ class ElFinderDialog
     $.ajax
       url: @opts.target_upgrader
       success: (data)=>
+
+        imgs_gallery = $(@opts.target).find(".gallery_item_blk")
+        imgs_destroyed_ids = []
+        $.each imgs_gallery, (index,element) ->
+          destroyed_input = $(element).find(".gallery_item_destroy_input")[0]
+          if($(destroyed_input).val()== "true")
+            imgs_destroyed_ids.push($(element).data("id"))
+
         elemento_gallery = $(data).find(@opts.target)
         $(@opts.target).html($(elemento_gallery).html())
+        target = @opts.target
+        gal_el = null
+        $.each imgs_destroyed_ids, (index,id) ->
+          el_to_hide = $(target).find(".gallery_item_blk[data-id='#{id}']")
+          input_destroy = $(el_to_hide).find(".gallery_item_destroy_input")[0]
+          $(el_to_hide).hide()
+          $(input_destroy).val(true)
+
+#        #elemento_gallery = $(data).find(@opts.target)
+#        $(@opts.target).html($(gal_el).html())
 
 
   open: ->
@@ -234,6 +252,19 @@ $(document).on 'click', '.clear_selection', (e)->
     $(opts.clearfieldIcon).attr('class','')
 
 
+$(document).on 'click', '.elfinder_picture_gallery .gallery_item_blk .destroy', (e)->
+  img_container = $(this).parents(".gallery_item_blk")[0]
+  input_destroy = $(img_container).find(".gallery_item_destroy_input")[0]
+  $(input_destroy).val(true)
+  $(img_container).hide()
+
+$(document).on 'page:change turbolinks:load', ->
+  $(".elfinder_picture_gallery .gallery_item_blk").each (index,element) ->
+    input_destroy = $(element).find(".gallery_item_destroy_input")[0]
+    img_container = $(element)
+    if($(input_destroy).val() == "true")
+      $(img_container).hide()
+      $(input_destroy).val(true)
 
 
 

data/app/assets/javascripts/alchemy-custom-model/manifest.js

@@ -22,3 +22,8 @@
 //= require "./total_page_elfinder"
 //= require "./sortable"
 //= require "./common_init"
+//= require "./alchemy_custom_model_select"
+//= require "flatpickr/i10n/it"
+//= require "../backend/date_picker"
+//= require "../backend/fix_more_image_in_element"
+//= require "../backend/override_alchemy_selectbox"

data/app/assets/javascripts/backend/date_picker.js

@@ -0,0 +1,24 @@
+$(document).on("page:change turbolinks:load",function(){
+
+    $("input[data-alchemy-datepicker-type]").each(function(index,element){
+        var  type = $(this).data('alchemy-datepicker-type');
+        var options = {
+            locale: Alchemy.locale.slice(0, 2),
+            altInput: true,
+            altFormat: Alchemy.t("formats."+type),
+            altInputClass: "",
+            enableTime: /time/.test(type),
+            noCalendar: type == "time",
+            time_24hr: Alchemy.t("formats.time_24hr"),
+
+        };
+
+        $(this).flatpickr(options);
+
+
+
+    })
+
+
+
+});

data/app/assets/javascripts/backend/fix_more_image_in_element.js.coffee

@@ -0,0 +1,10 @@
+$.extend Alchemy,
+  removePicture: (selector) ->
+    $form_field = $(selector)
+    $element = $form_field.closest(".element-editor")
+    $content = $form_field.closest(".content_editor")
+    if $form_field[0]
+      $form_field.val ""
+      $content.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
+      Alchemy.setElementDirty $element
+    false

data/app/assets/javascripts/backend/override_alchemy_selectbox.js

@@ -0,0 +1,8 @@
+$(document).ready(function(){
+
+    $("select.alchemy_selectbox").select2({
+        minimumResultsForSearch: 7,
+        dropdownAutoWidth: true,
+        allowClear: true
+    });
+})

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

@@ -13,9 +13,26 @@
       display: block;
       float: left;
       margin: 6px;
-      width: 100px;
-      height: 100px;
+      width: 140px;
+      height: 140px;
       overflow: hidden;
+      position: relative;
+
+      .command_area {
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        z-index: 0;
+        width: 100%;
+        padding: 4px 2px;
+        background-color: #f0f0f0;
+        .destroy {
+          float: right;
+          color: rgba(51, 59, 81, 0.8);
+          cursor: pointer
+        }
+      }
+
 
       .open_el_finder {
         width: 98%;
@@ -28,6 +45,7 @@
         i.fa-images {
           font-size: 50px;
           margin-top: 20px;
+          line-height: 90px;
         }
       }
     }

data/app/controllers/alchemy/custom/model/admin/base_controller.rb

@@ -20,6 +20,7 @@ module Alchemy::Custom::Model
         @query = base_class.ransack(params[:q])
         @objects = @query.result(distinct: true)
         @objects = @objects.accessible_by(current_ability).only_current_language
+        @total_objects = @objects
         @objects = @objects.page(params[:page]).
           per(params[:per_page] ||
                 (base_class::DEFAULT_PER_PAGE if base_class.const_defined? :DEFAULT_PER_PAGE) ||
@@ -64,6 +65,7 @@ module Alchemy::Custom::Model
         if @obj.respond_to? self.class.method_for_show
           @objects = @obj.send(self.class.method_for_show.to_sym)
           @objects = @objects.accessible_by(current_ability)
+          @total_objects = @objects
           @objects = @objects.page(params[:page]).
               per(params[:per_page] ||
                       (base_class::DEFAULT_PER_PAGE if base_class.const_defined? :DEFAULT_PER_PAGE) ||
@@ -79,6 +81,7 @@ module Alchemy::Custom::Model
         @query = base_class.ransack(params[:q])
         @objects = @query.result(distinct: true)
         @objects = @objects.accessible_by(current_ability)
+        @total_objects = @objects
         @objects = @objects.page(params[:page]).
             per(params[:per_page] ||
                     (base_class::DEFAULT_PER_PAGE if base_class.const_defined? :DEFAULT_PER_PAGE) ||

data/app/controllers/alchemy/custom/model/admin/base_with_globalize_controller.rb

@@ -0,0 +1,38 @@
+module Alchemy
+  module Custom
+    module Model
+      module Admin
+        class BaseWithGlobalizeController < ::Alchemy::Custom::Model::Admin::BaseController
+
+
+          around_action :switch_globalize_locale
+          before_action :load_object, except: :index
+
+
+          def index
+            @query = base_class.ransack(params[:q])
+            @objects = @query.result(distinct: true)
+            @objects = @objects.accessible_by(current_ability)
+            @total_objects = @objects
+            @objects = @objects.page(params[:page]).
+                per(params[:per_page] ||
+                        (base_class::DEFAULT_PER_PAGE if base_class.const_defined? :DEFAULT_PER_PAGE) ||
+                        25)
+            instance_variable_set "@#{base_class.name.demodulize.underscore.downcase.pluralize}", @objects
+          end
+
+
+
+          private
+
+          def switch_globalize_locale(&action)
+            locale = Alchemy::Language.current.language_code.to_sym
+            Globalize.with_locale(locale, &action)
+          end
+
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module Alchemy
+  module Admin
+    module NodesControllerDec
+      extend ActiveSupport::Concern
+
+      included do
+
+        def custom_models
+          @custom_model_klasses = Alchemy::Custom::Model.allowed_custom_models_for_menu
+          if params[:q] and params[:q][:name]
+            @custom_model_klasses = @custom_model_klasses.select { |el| el.match /#{params[:q][:name]}/i }
+          end
+          @custom_model_klasses = Kaminari.paginate_array(@custom_model_klasses).page(params[:page]).per(params[:per_page] || 10)
+
+        end
+
+        def custom_models_methods
+          @custom_model_klasses = Alchemy::Custom::Model.allowed_custom_models_for_menu
+          @custom_model_methods = []
+          if params[:q] and params[:q][:custom_model_klass]
+            klass = Alchemy::Custom::Model.allowed_custom_models_for_menu.select { |el| el == params[:q][:custom_model_klass] }.first
+            if !klass.nil? and klass.safe_constantize
+              klass = klass.constantize
+              if klass.respond_to? :menu_generator_methods
+                @custom_model_methods = klass.menu_generator_methods
+              end
+            end
+          end
+          @custom_model_methods = Kaminari.paginate_array(@custom_model_methods).page(params[:page]).per(params[:per_page] || 10)
+        end
+
+
+        private
+
+        def resource_params
+          params.require(:node).permit(
+              :site_id,
+              :parent_id,
+              :language_id,
+              :page_id,
+              :name,
+              :url,
+              :title,
+              :nofollow,
+              :external,
+              :custom_model_klass,
+              :custom_model_method
+          )
+        end
+
+
+      end
+    end
+  end
+end

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

@@ -221,9 +221,12 @@ 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}) do
+            render(layout: 'gallery_item', locals: {picture: join_record_form.object.picture, jr_id: join_record_form.object.id}) do
+              sb = ActiveSupport::SafeBuffer.new
 
-              join_record_form.hidden_field :position, class: 'gallery_position_counter'
+              sb << join_record_form.hidden_field(:position, class: 'gallery_position_counter')
+              sb << join_record_form.hidden_field(:_destroy, class: 'gallery_item_destroy_input')
+              sb
 
             end
           end

data/app/helpers/alchemy/pages_helper_decorator.rb

@@ -91,5 +91,43 @@ Alchemy::PagesHelper.module_eval do
   end
 
 
+  def check_if_active node_or_cm_inst
+    if !node_or_cm_inst.is_a? Alchemy::Node
+      if node_or_cm_inst.respond_to? :for_menu_matching and node_or_cm_inst.for_menu_matching.include? @custom_element
+        return true
+      end
+    else
+      if node_or_cm_inst.custom_model?
+        if @custom_element.respond_to? :for_menu_matching and
+            @custom_element.for_menu_matching.include? node_or_cm_inst.klass_custom_model
+          return true
+        end
+      elsif node_or_cm_inst.page and node_or_cm_inst.page.self_and_descendants.include? @page
+        return true
+      end
+    end
+    false
+  end
+
+  def render_menu_with_language(name, options = {})
+    root_node = Alchemy::Node.where(language_id: Alchemy::Language.current.id).roots.find_by(name: name)
+    if root_node.nil?
+      warning("Menu with name #{name} not found!")
+      return
+    end
+
+    options = {
+        node_partial_name: "#{root_node.view_folder_name}/node"
+    }.merge(options)
+
+    render(root_node, menu: root_node, node: root_node, options: options)
+  rescue ActionView::MissingTemplate => e
+    warning <<-WARN
+          Menu partial not found for #{name}.
+          #{e}
+    WARN
+  end
+
+
 end
 

data/app/models/concerns/alchemy/node_dec.rb

@@ -0,0 +1,45 @@
+module Alchemy
+  module NodeDec
+
+    extend ActiveSupport::Concern
+
+    included do
+
+      validates :custom_model_klass, presence: true, if: -> {
+        url.blank? and not parent.nil?
+      }
+
+      before_validation :ensure_page_nil_if_custom_model, on: [:create, :update]
+      before_validation :set_site, on: [:create], if: -> {site.nil?}
+
+      def custom_model?
+        !custom_model_klass.blank?
+      end
+
+      def klass_custom_model
+        self.custom_model_klass.constantize
+      end
+
+      private
+
+      def ensure_page_nil_if_custom_model
+        if not url.blank? and !custom_model_klass_changed? and !custom_model_method_changed?
+          self.custom_model_klass = nil
+          self.custom_model_method = nil
+        elsif !custom_model_klass.blank? and !url_changed?
+          self.page = nil
+          self.url = nil
+        end
+
+      end
+
+      def set_site
+        unless self.language.nil?
+          self.site = language.site
+        end
+      end
+
+
+    end
+  end
+end