alchemy-custom-model 2.1.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 18dbecf67db40ed24197196da81d783276e051fd
-  data.tar.gz: e621f92260133cd31d1636c4b5a2ae4e4d173e78
+SHA256:
+  metadata.gz: 2317c60439cb8da60f62ae80809fd4b70993e0bf7f9a8102a821c8163f75ec51
+  data.tar.gz: 2e2fc95122b44aa40c849985a98a5306597e680310a2aa6fe3ea4dfa5750ce25
 SHA512:
-  metadata.gz: f555a7ffc0e4e0eb68cc1b8b79e6b60ad7f60f29490c505d3270b4d99b625da384b775027d6ab317b0ba9c39410740d51f190c4a08e1967bfdb50c061f0a92b1
-  data.tar.gz: 8a0779d78372fb4c2f39a5123572ca752b22085e4309545399ba9a51fcc07e9bbbd1be87cfefd3d37f3b609c8c3202457cf90cdd8c3eb4976eaf2abcbfe66bb0
+  metadata.gz: 89cec5b88d99fb5db9f0ddbb7fc918c52d5889d747e76699af0cc623817aa800d3e9f0d650f2e1446eeab99f305421f24161b4349eba4643c4f8a4ce7aa40bfa
+  data.tar.gz: a95507e567669799eae556bea29d30952580359d83ffa83e799723aa464b3edb1684390f2dfe316b208347da05fb4de41a1dd9480111ca928d63265c18b4e244

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/assets/stylesheets/alchemy-custom-model/custom_style.css.scss

@@ -276,3 +276,98 @@
 
 }
 
+
+.alchemy-dialog {
+  max-width: 1080px !important;
+  width: 100% !important;
+
+  .attribute_row {
+    margin: 10px 0px;
+    display: flex;
+
+    .labelfield {
+      font-size: 15px;
+      font-weight: bold;
+      text-transform: uppercase;
+      display: inline-block;
+      width: 200px;
+      overflow: hidden;
+    }
+
+    .valuefield {
+      font-size: 15px;
+      display: inline-block;
+      width: calc(100% - 200px);
+      overflow: hidden;
+    }
+
+  }
+}
+
+
+.search_panel {
+  background-color: #e9cfb7;
+  color:#000;
+  padding: 5px;
+  .row {
+    width: 100%;
+    height: auto;
+    display: flex;
+  }
+  .title {
+    color:#204166;
+    background-color: #eca96e;
+    font-weight: bolder;
+    width: 100;
+    display: block;
+    text-align: center;
+    height: 30px;
+    .title_label {
+      float:left;
+      margin-top:5px;
+      padding-left: 5px;
+    }
+    .button_toggle {
+      float:right;
+      margin-top:5px;
+      padding-right: 5px;
+    }
+  }
+  .search_fields_group div.input {
+    width: 30%;
+    float: left;
+    padding: 0 15px;
+    margin: 2px 0; 
+  }
+  .action_buttons {
+    padding-top: 3px;
+  }
+}
+
+
+.show_page {
+  max-width: 1080px !important;
+  width: 100% !important;
+
+  .attribute_row {
+    margin: 10px 0px;
+    display: flex;
+
+    .labelfield {
+      font-size: 15px;
+      font-weight: bold;
+      text-transform: uppercase;
+      display: inline-block;
+      width: 200px;
+      overflow: hidden;
+    }
+
+    .valuefield {
+      font-size: 15px;
+      display: inline-block;
+      width: calc(100% - 200px);
+      overflow: hidden;
+    }
+
+  }
+}

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) ||
@@ -61,16 +62,19 @@ module Alchemy::Custom::Model
       end
 
       def show
-        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)
-          @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 "@#{self.class.method_for_show.to_s.underscore.downcase.pluralize}", @objects
-        else
-          @objects = base_class.none
+        unless self.class.method_for_show.nil?
+          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) ||
+                        25)
+            instance_variable_set "@#{self.class.method_for_show.to_s.underscore.downcase.pluralize}", @objects
+          else
+            @objects = base_class.none
+          end
         end
       end
 
@@ -79,10 +83,8 @@ module Alchemy::Custom::Model
         @query = base_class.ransack(params[:q])
         @objects = @query.result(distinct: true)
         @objects = @objects.accessible_by(current_ability)
-        @objects = @objects.page(params[:page]).
-            per(params[:per_page] ||
-                    (base_class::DEFAULT_PER_PAGE if base_class.const_defined? :DEFAULT_PER_PAGE) ||
-                    25)
+        @total_objects = @objects
+
 
 
         send_data generate_csv, filename: "export_member.csv", disposition: :attachment, type: "text/csv"

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