hancock_cms 1.0.1 → 1.0.2.2

data/lib/hancock/rails_admin_settings_patch.rb

@@ -3,29 +3,213 @@ module Hancock
     extend ActiveSupport::Concern
 
     included do
-      include Hancock::RailsAdminPatch
+      ::Hancock.register_model(self)
 
-      def self.manager_can_default_actions
-        [:show, :read, :edit, :update]
+      include ::Hancock::RailsAdminPatch
+
+      # 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 << :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_actions
+      def self.manager_cannot_add_actions
         [:new, :create, :delete, :destroy]
       end
 
       def self.rails_admin_add_visible_actions
-        ret = []
-        ret << :model_accesses if defined?(RailsAdminUserAbilities)
-        ret += [:comments, :model_comments] if defined?(RailsAdminComments)
-        ret << :hancock_touch if defined?(Hancock::Cache::Cacheable)
+        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

data/lib/hancock/version.rb

@@ -1,3 +1,3 @@
 module Hancock
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2.2".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'
@@ -26,15 +24,20 @@ 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'
@@ -43,13 +46,11 @@ require 'rails_admin_toggleable'
 require 'ack_rails_admin_settings'
 require 'hancock/rails_admin_settings_patch'
 
-# require 'x-real-ip'
-
 require 'ckeditor'
 
-# require 'kaminari'
-# require 'addressable/uri'
-# require 'turbolinks'
+require 'kaminari/actionview'
+
+require 'stickykit/rails'
 
 require 'hancock/model'
 require 'hancock/engine'
@@ -96,11 +97,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
- 

data/lib/rails_admin/custom_show_in_app.rb

@@ -1,42 +1,31 @@
 module RailsAdmin
   module Config
     module Actions
-      class CustomShowInApp < RailsAdmin::Config::Actions::Base
+      class CustomShowInApp < RailsAdmin::Config::Actions::ShowInApp
         RailsAdmin::Config::Actions.register(self)
 
-        register_instance_option :member do
-          true
-        end
+        # register_instance_option :visible? do
+        #   authorized? && (bindings[:controller].main_app.url_for(bindings[:object]) rescue false)
+        # 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 :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/template.rb

@@ -2,10 +2,12 @@ rails_spec = (Gem.loaded_specs["railties"] || Gem.loaded_specs["rails"])
 version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
+actual_rails_version = "4.2.8"
+notsupported_rails_version = "5.x"
 
-if Gem::Version.new(version) < Gem::Version.new('4.2.7') or Gem::Version.new(version) >= Gem::Version.new('5.0.0')
+if Gem::Version.new(version) < Gem::Version.new(actual_rails_version) or Gem::Version.new(version) >= Gem::Version.new(notsupported_rails_version)
   puts "You are using an incorrect version of Rails (#{version})"
-  puts "Please update for 4.2.7"
+  puts "Please update for #{actual_rails_version}"
   puts "Stopping"
   exit 1
 end
@@ -20,7 +22,7 @@ remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.7.1'
+gem 'rails', '~> #{actual_rails_version}'#, '>= #{actual_rails_version}'
 #{if mongoid then "gem 'mongoid'" else "gem 'pg'" end}
 
 gem 'sass'
@@ -34,18 +36,18 @@ gem 'compass-rails'
 # gem 'ack-paperclip-meta', github: "red-rocks/paperclip-meta"
 
 # gem 'rails_admin_multiple_file_upload'
-gem 'rails_admin_user_abilities', '~> 0.1.0'
+gem 'rails_admin_user_abilities'#, '~> 0.1'
 # gem 'rails_admin_user_abilities', github: "red-rocks/rails_admin_user_abilities"
-gem 'rails_admin_model_settings', '~> 0.2.1'
+gem 'rails_admin_model_settings'#, '~> 0.2'
 # gem 'rails_admin_model_settings', github: "red-rocks/rails_admin_model_settings"
 
-# #{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, github: 'red-rocks/hancock_cms', branch: 'rails4'
-#{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, path: "/home/ack/www/redrocks/hancock"
+#{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, github: 'red-rocks/hancock_cms', branch: 'rails4'
+# #{if mongoid then "gem 'hancock_cms_mongoid'" else "gem 'hancock_cms_activerecord'" end}, path: "/home/ack/www/redrocks/hancock"
 
 # gem 'recaptcha', require: 'recaptcha/rails'
 # gem 'glebtv-simple_captcha'
 
-gem 'slim-rails'
+gem 'slim-rails', '3.1.1'
 gem 'rs_russian'
 gem 'cancancan'
 
@@ -53,8 +55,6 @@ gem 'cancancan'
 gem 'unicorn'
 gem 'x-real-ip'
 
-gem 'sentry-raven'
-
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
@@ -99,6 +99,7 @@ gem 'sprockets'
 gem 'uglifier'
 
 group :production do
+  # gem 'sentry-raven'
   gem "god"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,14 +190,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +226,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari-actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +268,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stickykit-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'HancockCMS '
 email:
 - dev@redrocks.pro
@@ -247,6 +289,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -256,7 +299,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/devices/login-bg.jpg
-- app/assets/images/rails-admin/hancock_logo.svg
+- app/assets/images/hancock/rails_admin/hancock_logo.svg
 - app/assets/javascripts/hancock/app/back_to_top.coffee
 - app/assets/javascripts/hancock/cms.coffee
 - app/assets/javascripts/hancock/cms/flash.coffee
@@ -264,6 +307,14 @@ files:
 - app/assets/javascripts/hancock/cms/map.coffee
 - app/assets/javascripts/hancock/rails_admin/cms.ui.coffee
 - app/assets/javascripts/hancock/rails_admin/custom/ui.coffee
+- app/assets/javascripts/hancock/rails_admin/en_ru_switcher.coffee
+- app/assets/javascripts/hancock/rails_admin/enum_with_custom.coffee
+- app/assets/javascripts/hancock/rails_admin/form_controls_fixed.coffee
+- app/assets/javascripts/hancock/rails_admin/leftside_hider.coffee
+- app/assets/javascripts/hancock/rails_admin/multiselect.coffee
+- app/assets/javascripts/hancock/rails_admin/navigation_dropdown.coffee
+- app/assets/javascripts/hancock/rails_admin/navigation_filter.coffee
+- app/assets/javascripts/hancock/rails_admin/navigation_scroll.coffee
 - app/assets/javascripts/head.load.js
 - app/assets/javascripts/jquery.placeholder.js
 - app/assets/javascripts/rails_admin/custom/ui.coffee
@@ -275,6 +326,7 @@ files:
 - app/assets/stylesheets/hancock/cms/powered.sass
 - app/assets/stylesheets/hancock/rails_admin/cms.theming.sass
 - app/assets/stylesheets/hancock/rails_admin/custom/theming.sass
+- app/assets/stylesheets/hancock/rails_admin/fieldsets.sass
 - app/assets/stylesheets/hancock/toplink/toplink.sass
 - app/assets/stylesheets/rails_admin/custom/theming.sass
 - app/controllers/concerns/hancock/current_user.rb
@@ -289,6 +341,10 @@ files:
 - app/helpers/hancock/gzip_helper.rb
 - app/helpers/hancock/home_helper.rb
 - app/helpers/hancock/powered_helper.rb
+- app/helpers/hancock/settings_helper.rb
+- app/helpers/rails_admin/application/hancock_helper.rb
+- app/helpers/rails_admin/hancock/form_builder.rb
+- app/helpers/rails_admin/main/hancock_helper.rb
 - app/models/concerns/hancock/boolean_field.rb
 - app/models/concerns/hancock/decorators/embedded_element.rb
 - app/models/concerns/hancock/embedded_findable.rb
@@ -296,6 +352,7 @@ files:
 - app/models/concerns/hancock/geocodeable.rb
 - app/models/concerns/hancock/hash_field.rb
 - app/models/concerns/hancock/html_field.rb
+- app/models/concerns/hancock/insertion_field.rb
 - app/models/concerns/hancock/mappable.rb
 - app/models/concerns/hancock/model_localizeable.rb
 - app/models/concerns/hancock/rails_admin_patch.rb
@@ -329,21 +386,28 @@ files:
 - app/views/layouts/rails_admin/_footer_navigation.html.slim
 - app/views/layouts/rails_admin/_navigation.html.slim
 - app/views/layouts/rails_admin/_secondary_navigation.html.slim
+- app/views/layouts/rails_admin/_sidebar_navigation.html.slim
+- app/views/layouts/rails_admin/_sidebar_navigation_filter.html.slim
 - app/views/layouts/rails_admin/application.html.haml
 - app/views/layouts/rails_admin/pjax.html.haml
 - app/views/rails_admin/main/_check_boxes.html.slim
 - app/views/rails_admin/main/_enum_check_boxes.html.slim
+- app/views/rails_admin/main/_enum_for_settings_kinds.html.slim
 - app/views/rails_admin/main/_enum_radio_buttons.html.slim
 - app/views/rails_admin/main/_form_hancock_enum.html.slim
+- app/views/rails_admin/main/_form_hancock_enum_with_custom.slim
 - app/views/rails_admin/main/_form_hancock_multiselect.html.slim
 - app/views/rails_admin/main/_form_raw.html.slim
 - app/views/rails_admin/main/_hancock_hash.html.slim
 - app/views/rails_admin/main/_hancock_hash_ml.html.slim
 - app/views/rails_admin/main/_hancock_html.html.slim
 - app/views/rails_admin/main/_hancock_html_ml.html.slim
+- app/views/rails_admin/main/edit.html.haml
+- app/views/rails_admin/main/new.html.haml
 - app/views/shared/_admin_link.html.slim
 - app/views/shared/_messages.html.slim
 - config/initializers/hancock_cms.rb
+- config/initializers/rails_admin_mongoid_patch.rb
 - config/initializers/simple_captcha.rb
 - config/locales/en.hancock.yml
 - config/locales/en.hancock_admin.yml
@@ -410,14 +474,19 @@ files:
 - lib/hancock/plugin.rb
 - lib/hancock/plugin_configuration.rb
 - lib/hancock/rails_admin_ext/config.rb
+- lib/hancock/rails_admin_ext/hancock_array.rb
 - lib/hancock/rails_admin_ext/hancock_enum.rb
+- lib/hancock/rails_admin_ext/hancock_enum_with_custom.rb
 - lib/hancock/rails_admin_ext/hancock_hash.rb
 - lib/hancock/rails_admin_ext/hancock_html.rb
 - lib/hancock/rails_admin_ext/hancock_multiselect.rb
 - lib/hancock/rails_admin_ext/hancock_slugs.rb
 - lib/hancock/rails_admin_ext/patches/field_patch.rb
+- lib/hancock/rails_admin_ext/patches/fieldset_patch.rb
 - lib/hancock/rails_admin_ext/patches/group_patch.rb
 - lib/hancock/rails_admin_ext/patches/hancock_cms_group.rb
+- lib/hancock/rails_admin_ext/patches/has_fields.rb
+- lib/hancock/rails_admin_ext/patches/navigation_patch.rb
 - lib/hancock/rails_admin_ext/patches/new_controller_patch.rb
 - lib/hancock/rails_admin_settings_patch.rb
 - lib/hancock/routes.rb