hancock_cms 2.0.0.2 → 2.0.1.1

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

@@ -1,17 +1,13 @@
-require 'rails_admin/config/fields/types/enum'
+require 'hancock/rails_admin_ext/hancock_enum'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class HancockSlugs < RailsAdmin::Config::Fields::Types::Enum
+        class HancockSlugs < RailsAdmin::Config::Fields::Types::HancockEnum
           # 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

data/lib/hancock/rails_admin_settings_patch.rb

@@ -0,0 +1,219 @@
+module Hancock
+  module RailsAdminSettingsPatch
+    extend ActiveSupport::Concern
+
+    included do
+      ::Hancock.register_model(self)
+
+      include ::Hancock::RailsAdminPatch
+      if ::Hancock.config.mongoid_single_collection
+        include ::Hancock::MasterCollection
+      end
+
+      # t = {_all: 'Все'}
+      ::RailsAdminSettings::Setting.distinct(:ns).each do |c|
+        s = "ns_#{c.gsub('-', '_')}".to_sym
+        scope s, -> { where(ns: c) }
+        # t[s] = c
+      end
+      # I18n.backend.store_translations(:ru, {admin: {scopes: {'rails_admin_settings/setting': t}}})
+
+      field :for_admin, type: Boolean, default: -> {
+        !!(self.ns == "admin" or self.ns =~ /\Aadmin(\.\w+)*\z/)
+      }
+      def for_admin?
+        self.for_admin
+      end
+
+      # def self.manager_can_default_actions
+      #   # [:index, :show, :read, :edit, :update]
+      #   super - [:new, :create]
+      # end
+      # def self.manager_can_default_actions
+      #   ret = []
+      #   # ret << :model_accesses if ::Hancock::Goto.config.user_abilities_support
+      #   ret
+      # end
+      def self.manager_can_add_actions
+        ret = []
+        # ret << :model_accesses if defined?(::RailsAdminUserAbilities)
+        ret += [:comments, :model_comments] if defined?(::RailsAdminComments)
+        ret << :hancock_touch if defined?(::Hancock::Cache::Cacheable)
+        ret.freeze
+      end
+      def self.manager_cannot_add_actions
+        [:new, :create, :delete, :destroy]
+      end
+
+      def self.rails_admin_add_visible_actions
+        ret = manager_can_actions.dup
+        ret << :model_accesses if defined?(::RailsAdminUserAbilities)
+        ret += [:comments, :model_comments] if defined?(::RailsAdminComments)
+        ret << :hancock_touch if defined?(::Hancock::Cache::Cacheable)
+        ret.freeze
+      end
+
+      rails_admin do
+        navigation_label I18n.t('admin.settings.label')
+
+        list do
+          field :label do
+            visible false
+            searchable true
+            weight 1
+          end
+          field :enabled, :toggle do
+            weight 2
+          end
+          field :loadable, :toggle do
+            weight 3
+          end
+          field :ns do
+            searchable true
+            weight 4
+          end
+          field :key do
+            searchable true
+            weight 5
+          end
+          field :name do
+            weight 6
+          end
+          field :kind do
+            searchable true
+            weight 7
+          end
+          field :raw do
+            weight 8
+            searchable true
+            pretty_value do
+              if bindings[:object].file_kind?
+                "<a href='#{CGI::escapeHTML(bindings[:object].file.url)}'>#{CGI::escapeHTML(bindings[:object].to_path)}</a>".html_safe.freeze
+              elsif bindings[:object].image_kind?
+                "<a href='#{CGI::escapeHTML(bindings[:object].file.url)}'><img src='#{CGI::escapeHTML(bindings[:object].file.url)}' /></a>".html_safe.freeze
+              else
+                value
+              end
+            end
+          end
+          field :cache_keys_str, :text do
+            weight 10
+            searchable true
+          end
+          if ::Settings.table_exists?
+            nss = ::RailsAdminSettings::Setting.distinct(:ns).map { |c| "ns_#{c.gsub('-', '_')}".to_sym }
+            scopes([nil] + nss)
+          end
+        end
+
+        edit do
+          field :enabled, :toggle do
+            weight 1
+            visible do
+              if bindings[:object].for_admin?
+                render_object = (bindings[:controller] || bindings[:view])
+                render_object and (render_object.current_user.admin?)
+              else
+                true
+              end
+            end
+          end
+          field :loadable, :toggle do
+            weight 2
+            visible do
+              render_object = (bindings[:controller] || bindings[:view])
+              render_object and (render_object.current_user.admin?)
+            end
+          end
+          field :for_admin, :toggle do
+            weight 3
+            visible do
+              render_object = (bindings[:controller] || bindings[:view])
+              render_object and (render_object.current_user.admin?)
+            end
+          end
+          field :ns  do
+            weight 4
+            read_only true
+            help false
+            visible do
+              render_object = (bindings[:controller] || bindings[:view])
+              render_object and (render_object.current_user.admin?)
+            end
+          end
+          field :key  do
+            weight 5
+            read_only true
+            help false
+            visible do
+              render_object = (bindings[:controller] || bindings[:view])
+              render_object and (render_object.current_user.admin?)
+            end
+          end
+          field :label, :string do
+            weight 6
+            read_only do
+              render_object = (bindings[:controller] || bindings[:view])
+              !render_object or !(render_object.current_user.admin?)
+            end
+            help false
+          end
+          field :kind, :enum do
+            weight 7
+            read_only do
+              render_object = (bindings[:controller] || bindings[:view])
+              !render_object or !(render_object.current_user.admin?)
+            end
+            enum do
+              RailsAdminSettings.kinds
+            end
+            partial "enum_for_settings_kinds".freeze
+            help false
+          end
+          field :raw do
+            weight 8
+            partial "setting_value".freeze
+            visible do
+              !bindings[:object].upload_kind?
+            end
+            read_only do
+              if bindings[:object].for_admin?
+                render_object = (bindings[:controller] || bindings[:view])
+                !(render_object and (render_object.current_user.admin?))
+              else
+                false
+              end
+            end
+          end
+          if Settings.file_uploads_supported
+            field :file, Settings.file_uploads_engine do
+              weight 9
+              visible do
+                bindings[:object].upload_kind?
+              end
+              read_only do
+                if bindings[:object].for_admin?
+                  render_object = (bindings[:controller] || bindings[:view])
+                  !(render_object and (render_object.current_user.admin?))
+                else
+                  false
+                end
+              end
+            end
+          end
+
+          field :cache_keys_str, :text do
+            weight 10
+            visible do
+              render_object = (bindings[:controller] || bindings[:view])
+              render_object and render_object.current_user.admin?
+            end
+          end
+
+        end
+      end
+
+    end
+
+  end
+end

data/lib/hancock/version.rb

@@ -1,3 +1,3 @@
 module Hancock
-  VERSION = "2.0.0.2".freeze
+  VERSION = "2.0.1.1".freeze
 end

data/lib/hancock_cms.rb

@@ -15,8 +15,6 @@ require 'hancock/simple_form_patch'
 
 require 'geocoder'
 
-# require 'simple_captcha'
-# require 'validates_email_format_of'
 require 'filename_to_slug'
 
 require 'codemirror-rails'
@@ -25,29 +23,34 @@ 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 'x-real-ip'
+require 'hancock/rails_admin_settings_patch'
 
 require 'ckeditor'
 
-# require 'kaminari'
-# require 'addressable/uri'
-# require 'turbolinks'
+require 'kaminari/actionview'
+
+require 'stickykit/rails'
 
 require 'hancock/model'
 require 'hancock/engine'
@@ -89,11 +92,11 @@ module Hancock
           end
         rescue
         end
-      end
+      end if defined?(::HistoryTracker)
     end
 
     def clear_history!
-      ::HistoryTracker.delete_all
+      ::HistoryTracker.delete_all if defined?(::HistoryTracker)
     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
+    def text_slug
+      slug
+    end
+    def text_slug=(s)
+      self.slug = s
+    end
   end
 
-  module ClassMethods
+  class_methods do
     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
-