hancock_cms 1.0.2.3 → 2.0.0

data/lib/hancock/rails_admin_ext/config.rb

@@ -40,28 +40,6 @@ module Hancock
 
       action_unvisible_for(:custom_show_in_app, Proc.new { false })
       action_visible_for(:model_settings, Proc.new { false })
-
-      if defined?(RailsAdminNestedSet)
-        action_visible_for(:nested_set, Proc.new { false })
-      end
-
-      if defined?(RailsAdminMultipleFileUpload)
-        action_visible_for(:multiple_file_upload, Proc.new { false })
-        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)
@@ -103,27 +81,22 @@ module Hancock
     def actions_config(rails_admin_actions)
 
       @actions_list.each do |action|
-        if rails_admin_actions.respond_to?(action) and !RailsAdmin::Config::Actions.all.map { |a| a.class.name.demodulize.underscore }.include?(action.to_s)
+        if rails_admin_actions.respond_to?(action)
           rails_admin_actions.send(action) do
             visible do
-              if !bindings or bindings[:abstract_model].blank?
-                true
+              ret = false
+              if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
+                ret = bindings[:abstract_model].model.rails_admin_visible_actions.include?(action)
               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.to_sym)
-                else
-                  if visibility = Hancock.rails_admin_config.actions_visibility[action]
-                    if visibility.is_a?(Proc)
-                      ret = visibility.call(self)
-                    else
-                      ret = visibility.include? bindings[:abstract_model].model_name
-                    end
+                if visibility = Hancock.rails_admin_config.actions_visibility[action]
+                  if visibility.is_a?(Proc)
+                    ret = visibility.call(self)
+                  else
+                    ret = visibility.include? bindings[:abstract_model].model_name
                   end
-                end # if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
-                _context = bindings[:controller] || bindings[:view]
-                ret and _context and _context.can?(action, bindings[:abstract_model].model)
-              end # !bindings or bindings[:abstract_model].blank?
+                end
+              end # if bindings[:abstract_model].model.respond_to?(:rails_admin_visible_actions)
+              ret
             end # visible do
           end # rails_admin_actions.send(action) do
         end # if rails_admin_actions.respond_to?(action)
@@ -131,7 +104,6 @@ module Hancock
 
     end
 
-
     def cancancan_admin_rules(ability_object)
       Hancock.config.ability_admin_config.each do |config|
         _model = config[:model]
@@ -139,11 +111,9 @@ 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.cannot _model.admin_cannot_actions,  _model
+        ability_object.can _model.admin_can_actions, _model
       end
     end
-
     def cancancan_manager_rules(ability_object)
       Hancock.config.ability_manager_config.each do |config|
         _model = config[:model]
@@ -151,8 +121,7 @@ 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.cannot _model.manager_cannot_actions,  _model
+        ability_object.can _model.manager_can_actions, _model
       end
     end
 

data/lib/hancock/rails_admin_ext/hancock_hash.rb

@@ -26,13 +26,6 @@ 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
@@ -40,7 +33,7 @@ module RailsAdmin
           end
 
           register_instance_option :localized? do
-            @abstract_model.model.public_instance_methods.include?(translations_field)
+            @abstract_model.model_name.constantize.public_instance_methods.include?(translations_field)
           end
 
           register_instance_option :pretty_value do

data/lib/hancock/rails_admin_ext/hancock_html.rb

@@ -13,13 +13,6 @@ 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
@@ -44,14 +37,6 @@ 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
@@ -76,8 +61,8 @@ module RailsAdmin
           end
 
           register_instance_option :localized? do
-            @abstract_model.model.public_instance_methods.include?(html_translations_field) and
-              @abstract_model.model.public_instance_methods.include?(clear_translations_field)
+            @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)
           end
 
           register_instance_option :allowed_methods do

data/lib/hancock/rails_admin_ext/hancock_multiselect.rb

@@ -28,7 +28,11 @@ 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

@@ -1,13 +1,17 @@
-require 'hancock/rails_admin_ext/hancock_enum'
+require 'rails_admin/config/fields/types/enum'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class HancockSlugs < RailsAdmin::Config::Fields::Types::HancockEnum
+        class HancockSlugs < RailsAdmin::Config::Fields::Types::Enum
           # 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,9 +5,8 @@ module RailsAdmin
 
       class Base
         register_instance_option :weight do
-          0
+          name.to_sym == :default ? -1_000_000 : 0
         end
-
       end
 
     end

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

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

data/lib/hancock/version.rb

@@ -1,3 +1,3 @@
 module Hancock
-  VERSION = "1.0.2.3".freeze
+  VERSION = "2.0.0".freeze
 end

data/lib/hancock_cms.rb

@@ -15,6 +15,8 @@ require 'hancock/simple_form_patch'
 
 require 'geocoder'
 
+# require 'simple_captcha'
+# require 'validates_email_format_of'
 require 'filename_to_slug'
 
 require 'codemirror-rails'
@@ -23,34 +25,29 @@ require 'codemirror-rails'
 require 'rails_admin'
 require 'hancock/rails_admin_ext/config'
 
-require 'hancock/rails_admin_ext/hancock_enum'
-require 'hancock/rails_admin_ext/hancock_enum_with_custom'
-require 'hancock/rails_admin_ext/hancock_array'
 require 'hancock/rails_admin_ext/hancock_hash'
 require 'hancock/rails_admin_ext/hancock_html'
 require 'hancock/rails_admin_ext/hancock_slugs'
 require 'hancock/rails_admin_ext/hancock_multiselect'
 
-require 'hancock/rails_admin_ext/patches/navigation_patch'
 require 'hancock/rails_admin_ext/patches/field_patch'
-require 'hancock/rails_admin_ext/patches/fieldset_patch'
 require 'hancock/rails_admin_ext/patches/new_controller_patch'
 require 'hancock/rails_admin_ext/patches/group_patch'
 require 'hancock/rails_admin_ext/patches/hancock_cms_group'
-require 'hancock/rails_admin_ext/patches/has_fields'
 
 
 require 'rails_admin_nested_set'
 require 'rails_admin_toggleable'
 
 require 'ack_rails_admin_settings'
-require 'hancock/rails_admin_settings_patch'
 
-require 'ckeditor'
+# require 'x-real-ip'
 
-require 'kaminari/actionview'
+require 'ckeditor'
 
-require 'stickykit/rails'
+# require 'kaminari'
+# require 'addressable/uri'
+# require 'turbolinks'
 
 require 'hancock/model'
 require 'hancock/engine'
@@ -67,24 +64,19 @@ module Hancock
   class << self
 
     def rails4?
-      true
+      false
     end
 
     def rails5?
-      false
+      true
     end
 
+
     def register_model(model)
       Hancock::MODELS << model unless Hancock::MODELS.include?(model)
     end
-    def models_goto_hancock
-      MODELS.map { |m|
-        puts m.name
-        m.goto_hancock
-      }
-    end
     def register_plugin(plugin)
-      Hancock::PLUGINS << plugin unless Hancock::PLUGINS.include?(plugin)
+      Hancock::PLUGINS << plugin unless Hancock::MODELS.include?(plugin)
     end
 
     def clear_history_from_empty_objects
@@ -97,11 +89,11 @@ module Hancock
           end
         rescue
         end
-      end if defined?(::HistoryTracker)
+      end
     end
 
     def clear_history!
-      ::HistoryTracker.delete_all if defined?(::HistoryTracker)
+      ::HistoryTracker.delete_all
     end
 
   end

data/lib/manual_slug/active_record.rb

@@ -3,16 +3,16 @@ module ManualSlug::ActiveRecord
 
   included do
     extend FriendlyId
+  end
 
-    def text_slug
-      slug
-    end
-    def text_slug=(s)
-      self.slug = s
-    end
+  def text_slug
+    slug
+  end
+  def text_slug=(s)
+    self.slug = s
   end
 
-  class_methods do
+  module ClassMethods
     def manual_slug(field, options = {}, callback = true)
       friendly_id field, use: [:slugged, :finders]
       define_method(:should_generate_new_friendly_id?) do
@@ -28,5 +28,5 @@ module ManualSlug::ActiveRecord
       end if callback
     end
   end
-  
 end
+ 

data/lib/rails_admin/custom_show_in_app.rb

@@ -1,31 +1,42 @@
 module RailsAdmin
   module Config
     module Actions
-      class CustomShowInApp < RailsAdmin::Config::Actions::ShowInApp
+      class CustomShowInApp < RailsAdmin::Config::Actions::Base
         RailsAdmin::Config::Actions.register(self)
 
-        # register_instance_option :visible? do
-        #   authorized? && (bindings[:controller].main_app.url_for(bindings[:object]) rescue false)
-        # end
+        register_instance_option :member do
+          true
+        end
 
-        # register_instance_option :controller do
-        #   Proc.new do
-        #     if @object.class.name == 'Hancock::Pages::Page'
-        #       if @object.fullpath.blank?
-        #         redirect_to main_app.page_url(@object)
-        #       else
-        #         redirect_to @object.fullpath
-        #       end
-        #     elsif @object.class.name == 'Hancock::News::News'
-        #       redirect_to main_app.news_url(@object)
-        #     # elsif @object.class.name == 'Obj'
-        #     #   redirect_to main_app.object_url(@object.category, @object)
-        #     else
-        #       redirect_to main_app.url_for(@object)
-        #     end
-        #   end
-        # end
+        register_instance_option :visible? do
+          authorized? && (bindings[:controller].main_app.url_for(bindings[:object]) rescue false)
+        end
 
+        register_instance_option :controller do
+          Proc.new do
+            # if @object.class.name == 'Hancock::Pages::Page'
+            #   if @object.fullpath.blank?
+            #     redirect_to main_app.page_url(@object)
+            #   else
+            #     redirect_to @object.fullpath
+            #   end
+            # elsif @object.class.name == 'Hancock::News::News'
+            #   redirect_to main_app.news_url(@object)
+            # elsif @object.class.name == 'Obj'
+            #   redirect_to main_app.object_url(@object.category, @object)
+            # else
+            #   redirect_to main_app.url_for(@object)
+            # end
+          end
+        end
+
+        register_instance_option :link_icon do
+          'icon-eye-open'
+        end
+
+        register_instance_option :pjax? do
+          false
+        end
       end
     end
   end

data/release.sh

@@ -2,7 +2,7 @@
 bundle update
 git add --all .
 git commit -am "${*:1}"
-git push -u origin rails4
+git push -u origin rails5
 rake release
 cd mongoid
 bundle update && rake release