hancock_cms 1.0.1 → 1.0.2.2

data/lib/hancock/controller.rb

@@ -27,4 +27,13 @@ module Hancock::Controller
   def hide_ym_ga
     false
   end
+
+  # HARD Rails5 compatibility
+  def redirect_back(fallback_location:, **args)
+    if referer = request.headers["Referer"]
+      redirect_to referer, **args
+    else
+      redirect_to fallback_location, **args
+    end
+  end
 end

data/lib/hancock/engine.rb

@@ -1,56 +1,48 @@
 module Hancock
-    class Engine < ::Rails::Engine
-      # isolate_namespace Hancock
+  class Engine < ::Rails::Engine
+    # isolate_namespace Hancock
 
     # rake_tasks do
     #   require File.expand_path('../tasks', __FILE__)
     # end
 
+
     initializer "RailsAdminSettingsPatch (CMS)" do
       ::RailsAdminSettings::Setting.send(:include, Hancock::RailsAdminSettingsPatch)
     end
 
-    initializer "hancock_cms.email_defaults" do
-      # Write default email settings to DB so they can be changed.
 
-      #temp
+    config.to_prepare do
+      require 'rails_admin/hancock/form_builder'
+
+      ::RailsAdmin::MainController.send(:include, ::RailsAdmin::Application::HancockHelper)
+      ::RailsAdmin::MainController.send(:include, ::RailsAdmin::Main::HancockHelper)
+      # ::RailsAdmin::ApplicationHelper.send(:include, ::RailsAdmin::Hancock::FormBuilder)
+
+      ::RailsAdmin::ApplicationController.send(:helper, ::RailsAdmin::Application::HancockHelper)
+      ::RailsAdmin::ApplicationController.send(:helper, ::RailsAdmin::Main::HancockHelper)
+    end
+
+    config.after_initialize do
+
       begin
         if Settings and Settings.table_exists?
-      #     Settings.default_email_from(default: 'noreply@site.domain')
-      #     Settings.form_email(default: 'admin@site.domain')
-      #     Settings.email_topic(default: 'с сайта')
-          Settings.logo_image(kind: :image)
+          if Settings.file_uploads_supported
+            if !RailsAdminSettings::Setting.ns("main").where(key: "logo_image").exists?
+              Settings.logo_image(kind: :image)
+            end
+          end
         end
       rescue
       end
-    end
-    # initializer 'hancock_cms.paperclip' do
-    #   # require 'paperclip/style'
-    #   # module ::Paperclip
-    #   #   class Style
-    #   #     alias_method :processor_options_without_auto_orient, :processor_options
-    #   #     def processor_options
-    #   #       processor_options_without_auto_orient.merge(auto_orient: false)
-    #   #     end
-    #   #   end
-    #   # end
-    # end
 
-    # config.after_initialize do
-    #   # trigger autoload so models are registered in Mongoid::Elasticearch
-    #   # Hancock.config.search_models.map(&:constantize)
-    #
-    #   # Write default email settings to DB so they can be changed.
-    #   begin
-    #     if Settings and Settings.table_exists?
-    #       # Settings.default_email_from(default: 'noreply@site.domain')
-    #       # Settings.form_email(default: 'admin@site.domain')
-    #       # Settings.email_topic(default: 'с сайта')
-    #       Settings.logo_image(kind: :image)
-    #     end
-    #   rescue
-    #   end
-    # end
+      # clear empty history for prevent admin panel crashs
+      begin
+        ::Hancock.clear_history_from_empty_objects
+      rescue
+      end
+
+    end
 
   end
 end

data/lib/hancock/model.rb

@@ -4,6 +4,12 @@ module Hancock
     included do
       Hancock.register_model(self)
 
+      def self.inherited(base)
+        super
+        Hancock.register_model(base)
+        Hancock.register_model(self)
+      end
+
       if Hancock.mongoid?
         include Mongoid::Document
         include Mongoid::Timestamps::Short

data/lib/hancock/models/embedded_element.rb

@@ -2,11 +2,13 @@ module Hancock
   module Models
     module EmbeddedElement
       extend ActiveSupport::Concern
+
       include Hancock::Model
       include Hancock::Enableable
       include Hancock::Sortable
 
       include Hancock.orm_specific('EmbeddedElement')
+      
     end
   end
 end

data/lib/hancock/models/mongoid/embedded_element.rb

@@ -8,6 +8,23 @@ module Hancock
 
         included do
           field :name, type: String, localize: Hancock.configuration.localize, default: ""
+
+          # stolen from https://github.com/mongoid/mongoid-history/blob/master/lib/mongoid/history/trackable.rb#L171
+          def embed_method_for_parent
+            ret = nil
+            if self._parent
+              ret = self._parent.relations.values.find do |relation|
+                if ::Mongoid::Compatibility::Version.mongoid3?
+                  relation.class_name == self.metadata.class_name.to_s && relation.name == self.metadata.name
+                else
+                  relation.class_name == self.relation_metadata.class_name.to_s &&
+                  relation.name == self.relation_metadata.name
+                end
+              end
+            end
+            ret and ret.name
+          end
+
         end
 
       end

data/lib/hancock/plugin_configuration.rb

@@ -5,7 +5,7 @@ module Hancock::PluginConfiguration
       @configuration ||= config_class.new if config_class
     end
     def config
-      @configuration ||= config_class.new if config_class
+      configuration
     end
 
     def configure

data/lib/hancock/rails_admin_ext/config.rb

@@ -50,6 +50,18 @@ module Hancock
         action_visible_for(:multiple_file_upload_collection, Proc.new { false })
       end
 
+      if defined?(RailsAdminUserAbilities)
+        action_visible_for(:user_abilities, Proc.new { false })
+        action_visible_for(:model_accesses, Proc.new { false })
+      end
+
+      if defined?(RailsAdminComments)
+        action_visible_for(:comments, Proc.new { false })
+        action_visible_for(:model_comments, Proc.new { false })
+      end
+
+      action_visible_for(:sort_embedded, Proc.new { false })
+
     end
 
     def add_action(action_name)
@@ -99,7 +111,7 @@ module Hancock
               else
                 ret = false
                 if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
-                  ret = bindings[:abstract_model].model.rails_admin_visible_actions.include?(action)
+                  ret = bindings[:abstract_model].model.rails_admin_visible_actions.include?(action.to_sym)
                 else
                   if visibility = Hancock.rails_admin_config.actions_visibility[action]
                     if visibility.is_a?(Proc)
@@ -109,7 +121,8 @@ module Hancock
                     end
                   end
                 end # if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
-                ret
+                _context = bindings[:controller] || bindings[:view]
+                ret and _context and _context.can?(action, bindings[:abstract_model].model)
               end # !bindings or bindings[:abstract_model].blank?
             end # visible do
           end # rails_admin_actions.send(action) do
@@ -118,6 +131,7 @@ module Hancock
 
     end
 
+
     def cancancan_admin_rules(ability_object)
       Hancock.config.ability_admin_config.each do |config|
         _model = config[:model]
@@ -125,9 +139,11 @@ module Hancock
         ability_object.send(config[:method], config[:actions], _model)
       end
       Hancock::MODELS.each do |_model|
-        ability_object.can _model.admin_can_actions, _model
+        ability_object.can    _model.admin_can_actions,     _model
+        ability_object.cannot _model.admin_cannot_actions,  _model
       end
     end
+
     def cancancan_manager_rules(ability_object)
       Hancock.config.ability_manager_config.each do |config|
         _model = config[:model]
@@ -135,7 +151,8 @@ module Hancock
         ability_object.send(config[:method], config[:actions], _model)
       end
       Hancock::MODELS.each do |_model|
-        ability_object.can _model.manager_can_actions, _model
+        ability_object.can    _model.manager_can_actions,     _model
+        ability_object.cannot _model.manager_cannot_actions,  _model
       end
     end
 

data/lib/hancock/rails_admin_ext/hancock_array.rb

@@ -0,0 +1,19 @@
+require 'hancock_enum_with_custom'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class HancockArray < RailsAdmin::Config::Fields::Types::HancockEnumWithCustom
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :multiple do
+            true
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/hancock/rails_admin_ext/hancock_enum.rb

@@ -8,6 +8,16 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :searchable do
+            true
+          end
+          register_instance_option :searchable_columns do
+            [{column: "#{abstract_model.table_name}.#{enum_method}" , type: :string}]
+          end
+          register_instance_option :queryable do
+            true
+          end
+
           register_instance_option :partial do
             :form_hancock_enum
           end

data/lib/hancock/rails_admin_ext/hancock_enum_with_custom.rb

@@ -0,0 +1,34 @@
+require 'hancock_enum'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class HancockEnumWithCustom < RailsAdmin::Config::Fields::Types::HancockEnum
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+          register_instance_option :help do
+            'Выберите из списка или введите свой вариант'
+          end
+
+          register_instance_option :enum do
+            []
+          end
+
+          register_instance_option :unique do
+            true
+          end
+
+          register_instance_option :selection do
+            ([enum] + [form_value]).flatten.uniq
+          end
+
+          register_instance_option :partial do
+            :form_hancock_enum_with_custom
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/hancock/rails_admin_ext/hancock_hash.rb

@@ -26,6 +26,13 @@ module RailsAdmin
             true
           end
 
+          register_instance_option :searchable do
+            string_method.to_s
+          end
+          register_instance_option :queryable do
+            true
+          end
+
 
           ############ localize ######################
           register_instance_option :translations_field do
@@ -33,7 +40,7 @@ module RailsAdmin
           end
 
           register_instance_option :localized? do
-            @abstract_model.model_name.constantize.public_instance_methods.include?(translations_field)
+            @abstract_model.model.public_instance_methods.include?(translations_field)
           end
 
           register_instance_option :pretty_value do

data/lib/hancock/rails_admin_ext/hancock_html.rb

@@ -13,6 +13,13 @@ module RailsAdmin
             "#{name}_html".to_sym
           end
 
+          register_instance_option :searchable do
+            html_method.to_s
+          end
+          register_instance_option :queryable do
+            true
+          end
+
           register_instance_option :clear_method do
             "#{name}_clear".to_sym
           end
@@ -37,6 +44,14 @@ module RailsAdmin
             true
           end
 
+          register_instance_option :help do
+            if @abstract_model.model.respond_to?(:insertions_fields)
+              if @abstract_model.model.insertions_fields.include?(name)
+                'Можно использовать вставки'
+              end
+            end
+          end
+
 
           ############ localize ######################
           register_instance_option :html_translations_field do
@@ -61,8 +76,8 @@ module RailsAdmin
           end
 
           register_instance_option :localized? do
-            @abstract_model.model_name.constantize.public_instance_methods.include?(html_translations_field) and
-              @abstract_model.model_name.constantize.public_instance_methods.include?(clear_translations_field)
+            @abstract_model.model.public_instance_methods.include?(html_translations_field) and
+              @abstract_model.model.public_instance_methods.include?(clear_translations_field)
           end
 
           register_instance_option :allowed_methods do

data/lib/hancock/rails_admin_ext/hancock_multiselect.rb

@@ -28,11 +28,7 @@ module RailsAdmin
           def nested_form
             false
           end
-
-          # def method_name
-          #   "#{super.to_s.singularize}_ids".to_sym
-          # end
-
+          
           # Reader for validation errors of the bound object
           def errors
             bindings[:object].errors[name]

data/lib/hancock/rails_admin_ext/hancock_slugs.rb

@@ -8,10 +8,6 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types::register(self)
 
-          register_instance_option :searchable do
-            true
-          end
-
           register_instance_option :enum_method do
             :slugs
           end

data/lib/hancock/rails_admin_ext/patches/field_patch.rb

@@ -5,8 +5,9 @@ module RailsAdmin
 
       class Base
         register_instance_option :weight do
-          name.to_sym == :default ? -1_000_000 : 0
+          0
         end
+
       end
 
     end

data/lib/hancock/rails_admin_ext/patches/fieldset_patch.rb

@@ -0,0 +1,14 @@
+require 'rails_admin'
+module RailsAdmin
+  module Config
+    module Fields
+
+      class Group
+        register_instance_option :leftside_hider do
+          true
+        end
+      end
+
+    end
+  end
+end

data/lib/hancock/rails_admin_ext/patches/group_patch.rb

@@ -15,6 +15,15 @@ module RailsAdmin
             a.weight <=> b.weight
           end
         end
+
+        def group(name, &block)
+          _groups = parent.groups rescue root.groups
+          group = _groups.detect { |g| name == g.name }
+          group ||= (parent.groups << RailsAdmin::Config::Fields::Group.new(self, name)).last
+          group.tap { |g| g.section = self }.instance_eval(&block) if block
+          group
+        end
+
       end
 
     end

data/lib/hancock/rails_admin_ext/patches/hancock_cms_group.rb

@@ -27,6 +27,7 @@ module Hancock::RailsAdminGroupPatch
             end
 
             _group_fields.each_pair do |name, type|
+              next if type == false
               if type.blank?
                 field name
               else
@@ -44,6 +45,7 @@ module Hancock::RailsAdminGroupPatch
 
       else
         fields.each_pair do |name, type|
+          next if type == false
           if type.nil?
             config.field name
           else

data/lib/hancock/rails_admin_ext/patches/has_fields.rb

@@ -0,0 +1,27 @@
+require 'rails_admin'
+module RailsAdmin
+  module Config
+    # Provides accessors and autoregistering of model's fields.
+    module HasFields
+
+    protected
+
+      # Raw fields.
+      # Recursively returns parent section's raw fields
+      # Duping it if accessed for modification.
+      def _fields(readonly = false)
+        return @_fields if @_fields
+        return @_ro_fields if readonly && @_ro_fields
+
+        if self.class == RailsAdmin::Config::Sections::Base
+          @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
+        else
+          # parent is RailsAdmin::Config::Model, recursion is on Section's classes
+          @_ro_fields ||= parent.send(self.class.superclass.to_s.underscore.split('/').last)._fields(true)
+          @_ro_fields.freeze if Rails.env.production? or Rails.env.staging?
+        end
+        readonly ? @_ro_fields : (@_fields ||= @_ro_fields.collect(&:clone))
+      end
+    end
+  end
+end

data/lib/hancock/rails_admin_ext/patches/navigation_patch.rb

@@ -0,0 +1,25 @@
+require 'rails_admin'
+module RailsAdmin
+  module Config
+
+    class Model
+      register_instance_option :navigation_icon do
+        abstract_model.model.try('rails_admin_navigation_icon')
+      end
+
+      register_instance_option :name_synonyms do
+        if name_synonyms_method
+          ret = abstract_model.model.try(name_synonyms_method)
+          ret = ret.join(" ") if ret.is_a?(Array)
+        else
+          ret = ''
+        end
+        ret.freeze
+      end
+      register_instance_option :name_synonyms_method do
+        :rails_admin_name_synonyms
+      end
+    end
+
+  end
+end