hancock_cms 2.0.0.2 → 2.0.1.1

data/app/views/layouts/rails_admin/application.html.haml

@@ -18,7 +18,9 @@
       = render "layouts/rails_admin/navigation"
 
     .admin-menubar.admin-menubar-fixed.admin-menubar-dark
-      .toolbar
+      .navigation-filter
+        = render "layouts/rails_admin/sidebar_navigation_filter"
+      .toolbar.custom_scroll
         = render "layouts/rails_admin/sidebar_navigation"
       .admin-menubar-footer
         = render "layouts/rails_admin/footer_navigation"
@@ -29,40 +31,3 @@
 
     %footer.admin-footer
       = render "layouts/rails_admin/footer"
-
-    -#%nav.navbar-hancock.navbar-fixed
-    -#  = render "layouts/rails_admin/navigation"
-    -#
-    -#%main.root
-    -#  .sidebar.fixed-sidebar
-    -#    .sidebar-backdrop
-    -#    .toolbar
-    -#      = render "layouts/rails_admin/sidebar_navigation"
-    -#
-    -#  .content-wrapper
-    -#    .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
-    -#
-    -#%footer.footer
-    -#  = render "layouts/rails_admin/footer"
-
-  -#%body.rails_admin
-  -#  #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
-  -#  %nav.navbar.navbar-default.navbar-fixed-top
-  -#    = render "layouts/rails_admin/navigation"
-  -#
-  -#  .menu-bar
-  -#    = render "layouts/rails_admin/sidebar_navigation"
-  -#
-  -#  .page-content
-  -#    .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
-  -#
-  -#
-  -#
-  -#  #status-bar
-
-    -#.container-fluid
-    -#  .row
-    -#    .col-sm-3.col-md-2.sidebar-nav.hancock-nav
-    -#      = render "layouts/rails_admin/sidebar_navigation"
-    -#    .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2.sidebar-content
-    -#      .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'

data/app/views/rails_admin/main/_enum_for_settings_kinds.html.slim

@@ -0,0 +1,24 @@
+.form-control-static
+  span= field.form_value
+  span= " "
+  span= " "
+  span= " "
+  span= link_to '(изменить)', "#", onclick: "var _p = $(this).closest('.form-control-static'); _p.siblings('.hancock_enum').removeClass('hidden'); _p.remove(); return false;", style: 'color: grey;', onmouseover: 'this.style.color = "darkgrey";', onmouseout: 'this.style.color = "grey";'
+- unless field.multiple?
+  = form.select field.method_name, field.enum, { include_blank: true }.reverse_merge({ selected: field.form_value }), field.html_attributes.reverse_merge({ data: { enumeration: true }, placeholder: t('admin.misc.search'), class: 'hancock_enum hidden'})
+- else
+  ruby:
+    js_data = {
+      xhr: false,
+      sortable: false,
+      cacheAll: true,
+      regional: {
+        chooseAll: t("admin.misc.chose_all"),
+        chosen: t("admin.misc.chosen", name: config.label_plural),
+        clearAll: t("admin.misc.clear_all"),
+        search: t("admin.misc.search"),
+        up: t("admin.misc.up"),
+        down: t("admin.misc.down")
+      }
+    }
+  = form.select field.method_name, field.enum, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true, class: 'hancock_enum hidden'})

data/app/views/rails_admin/main/_form_hancock_enum.html.slim

@@ -0,0 +1,18 @@
+- unless field.multiple?
+  = form.select field.method_name, field.enum, { include_blank: true }.reverse_merge({ selected: field.form_value }), field.html_attributes.reverse_merge({ data: { enumeration: true }, placeholder: t('admin.misc.search'), class: 'hancock_enum'})
+- else
+  ruby:
+    js_data = {
+      xhr: false,
+      sortable: false,
+      cacheAll: true,
+      regional: {
+        chooseAll: t("admin.misc.chose_all"),
+        chosen: t("admin.misc.chosen", name: config.label_plural),
+        clearAll: t("admin.misc.clear_all"),
+        search: t("admin.misc.search"),
+        up: t("admin.misc.up"),
+        down: t("admin.misc.down")
+      }
+    }
+  = form.select field.method_name, field.enum, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true, class: 'hancock_enum'})

data/app/views/rails_admin/main/_form_hancock_enum_with_custom.slim

@@ -0,0 +1,20 @@
+- unless field.multiple?
+  / = form.select field.method_name, field.enum, { include_blank: true }.reverse_merge({ selected: field.form_value }), field.html_attributes.reverse_merge({ data: { enumeration: true }, placeholder: t('admin.misc.search'), class: 'hancock_enum'})
+  = form.select field.method_name, field.selection, { include_blank: true }.reverse_merge({ selected: field.form_value }), field.html_attributes.reverse_merge({ data: { enumeration: true }, placeholder: t('admin.misc.search_or_add_yours'), class: 'hancock_enum'})
+- else
+  ruby:
+    js_data = {
+      xhr: false,
+      sortable: false,
+      cacheAll: true,
+      regional: {
+        chooseAll: t("admin.misc.chose_all"),
+        chosen: t("admin.misc.chosen", name: config.label_plural),
+        clearAll: t("admin.misc.clear_all"),
+        search: t("admin.misc.search_or_add_yours"),
+        up: t("admin.misc.up"),
+        down: t("admin.misc.down")
+      }
+    }
+  / = form.select field.method_name, field.enum, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true, class: 'hancock_enum'})
+  = form.select field.method_name, field.selection, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json, unique: field.unique }, multiple: true, class: 'hancock_enum'})

data/app/views/rails_admin/main/_hancock_html.html.slim

@@ -1,9 +1,9 @@
 ruby:
   js_data = {
-    jspath: field.location ? field.location : field.base_location + "ckeditor.js",
+    jspath: asset_path(field.location ? field.location : field.base_location + "ckeditor.js"),
     base_location: field.base_location,
     options: {
-      customConfig: field.config_js ? field.config_js : field.base_location + "config.js"
+      customConfig: asset_path(field.config_js ? field.config_js : field.base_location + "config.js")
     }
   }
   _html_attributes = field.html_attributes.reverse_merge(data: { richtext: 'ckeditor', options: js_data.to_json, value: field.form_value[:html] })

data/app/views/rails_admin/main/_hancock_html_ml.html.slim

@@ -6,40 +6,37 @@ ul.nav.nav-tabs
 .tab-content
   / = form.fields_for field.translations_field do |localized_field|
   - I18n.available_locales.each do |locale|
-        - _class = "#{[( 'active' if locale == I18n.locale ), uuid].join(" ")}"
-        .fields.tab-pane(style='padding:5px; margin: 0;' id="#{locale}_#{uuid}" class="#{_class}")
-          = form.fields_for field.html_translations_field do |html_localized_field|
-            ruby:
-              js_data = {
-                jspath: field.location ? field.location : field.base_location + "ckeditor.js",
-                base_location: field.base_location,
-                options: {
-                  customConfig: field.config_js ? field.config_js : field.base_location + "config.js"
-                }
-              }
-              _html_attributes = field.html_attributes.reverse_merge(data: { 
-                richtext: 'ckeditor', 
-                options: js_data.to_json
-              })
-              _html_attributes[:value] = field.form_value[:html] ? field.form_value[:html][locale] : ""
-            = html_localized_field.send :text_area, locale , _html_attributes
-            
-          = form.fields_for field.clear_translations_field do |clear_localized_field|
-            label{style='display: block;'}
-              ruby:
-                _value = field.form_value[:clear] ? field.form_value[:clear][locale] : true
-                _hash = { 
-                  value: _value, 
-                  checked: _value.in?([true, '1']),
-                  required: false, 
-                  class: "form-control"
-                }
-                _html_attributes = field.html_attributes.reverse_merge(_hash)
-              span{style='float: left'}= clear_localized_field.send field.boolean_view_helper, locale , _html_attributes
-              div{style='margin-left: 35px; line-height: 40px;'} Убирать теги
-          
-          
-          
+    - _class = "#{[( 'active' if locale == I18n.locale ), uuid].join(" ")}"
+    .fields.tab-pane(style='padding:5px; margin: 0;' id="#{locale}_#{uuid}" class="#{_class}")
+      = form.fields_for field.html_translations_field do |html_localized_field|
+        ruby:
+          js_data = {
+            jspath: asset_path(field.location ? field.location : field.base_location + "ckeditor.js"),
+            base_location: field.base_location,
+            options: {
+              customConfig: asset_path(field.config_js ? field.config_js : field.base_location + "config.js")
+            }
+          }
+          _html_attributes = field.html_attributes.reverse_merge(data: {
+            richtext: 'ckeditor',
+            options: js_data.to_json
+          })
+          _html_attributes[:value] = field.form_value[:html] ? field.form_value[:html][locale] : ""
+        = html_localized_field.send :text_area, locale , _html_attributes
+
+      = form.fields_for field.clear_translations_field do |clear_localized_field|
+        label{style='display: block;'}
+          ruby:
+            _value = field.form_value[:clear] ? field.form_value[:clear][locale] : true
+            _hash = {
+              value: _value,
+              checked: _value.in?([true, '1']),
+              required: false,
+              class: "form-control"
+            }
+            _html_attributes = field.html_attributes.reverse_merge(_hash)
+          span{style='float: left'}= clear_localized_field.send field.boolean_view_helper, locale , _html_attributes
+          div{style='margin-left: 35px; line-height: 40px;'} Убирать теги
 
 javascript:
   var #{field.name}#{field.object_id} = (new Date().getTime()) + Math.floor(Math.random()*100000);

data/app/views/rails_admin/main/edit.html.haml

@@ -0,0 +1,18 @@
+:ruby
+  opts = {
+    builder: (defined?(RailsAdmin::Hancock::FormBuilder) ? RailsAdmin::Hancock::FormBuilder : RailsAdmin::FormBuilder),
+    url: edit_path(@abstract_model, @object.id),
+    as: @abstract_model.param_key,
+    html: {
+      method: "put",
+      multipart: true,
+      class: "form-horizontal denser",
+      data: {
+        title: @page_name
+      }
+    }
+  }
+= rails_admin_form_for @object, opts do |form|
+  = form.generate action: :update
+/ = hancock_rails_admin_form_for @object, opts do |form|
+/   = form.generate action: :update

data/app/views/rails_admin/main/new.html.haml

@@ -0,0 +1,17 @@
+:ruby
+  opts = {
+    builder: (defined?(RailsAdmin::Hancock::FormBuilder) ? RailsAdmin::Hancock::FormBuilder : RailsAdmin::FormBuilder),
+    url: new_path(model_name: @abstract_model.to_param),
+    as: @abstract_model.param_key,
+    html: {
+      multipart: true,
+      class: "form-horizontal denser",
+      data: {
+        title: @page_name
+      }
+    }
+  }
+= rails_admin_form_for @object, opts do |form|
+  = form.generate action: :create
+/ = hancock_rails_admin_form_for @object, opts do |form|
+/   = form.generate action: :create

data/app/views/shared/_admin_link.html.slim

@@ -1,3 +1,5 @@
 - if user_signed_in? && respond_to?(:can?) && can?(:access, :rails_admin) && can?(:edit, obj)
-  .admin_link
-    = link_to t('hancock.edit'), rails_admin.edit_path(obj.class.model_name.i18n_key.to_s.gsub('/', '~'), obj.id), 'data-no-turbolink' => true
+  - cache obj do
+    .admin_button
+      .admin_link
+        = link_to t('hancock.edit'), rails_admin.edit_path(obj.class.model_name.i18n_key.to_s.gsub('/', '~'), obj.id), 'data-no-turbolink' => true

data/config/initializers/nested_set_patch.rb

@@ -1,89 +1,92 @@
-# Patach for glebtv-mongoid_nested_set and rails5 (belongs_to is required)
-require 'glebtv-mongoid_nested_set'
+if defined?(Mongoid)
+  # Patch for glebtv-mongoid_nested_set and rails5 (belongs_to is required)
+  require 'glebtv-mongoid_nested_set'
 
-module Mongoid::Acts::NestedSet
-  module Base
-    # Configuration options are:
-    #
-    # * +:parent_field+ - field name to use for keeping the parent id (default: parent_id)
-    # * +:left_field+ - field name for left boundary data, default 'lft'
-    # * +:right_field+ - field name for right boundary data, default 'rgt'
-    # * +:outline_number_field+ - field name for the number field, default nil.  If set,
-    #   the value will be used as a field name to keep track of each node's
-    #   "outline number" (e.g. 1.2.5).
-    # * +:scope+ - restricts what is to be considered a list.  Given a symbol, it'll attach
-    #   "_id" (if it hasn't been already) and use that as the foreign key restriction.  You
-    #   can also pass an array to scope by multiple attributes
-    # * +:dependent+ - behavior for cascading destroy.  If set to :destroy, all the child
-    #   objects are destroyed alongside this object by calling their destroy method.  If set
-    #   to :delete_all (default), all the child objects are deleted without calling their
-    #   destroy method.
-    # * +:klass+ - class to use for queries (defaults to self)
-    #
-    # See Mongoid::Acts::NestedSet::ClassMethods for a list of class methods and
-    # Mongoid::Acts::NestedSet::InstanceMethods for a list of instance methods added to
-    # acts_as_nested_set models
-    def acts_as_nested_set(options = {})
-      options = {
-        :parent_field => 'parent_id',
-        :left_field => 'lft',
-        :right_field => 'rgt',
-        :outline_number_field => nil,
-        :dependent => :delete_all, # or :destroy
-        :klass => self,
-      }.merge(options)
+  module Mongoid::Acts::NestedSet
+    module Base
+      # Configuration options are:
+      #
+      # * +:parent_field+ - field name to use for keeping the parent id (default: parent_id)
+      # * +:left_field+ - field name for left boundary data, default 'lft'
+      # * +:right_field+ - field name for right boundary data, default 'rgt'
+      # * +:outline_number_field+ - field name for the number field, default nil.  If set,
+      #   the value will be used as a field name to keep track of each node's
+      #   "outline number" (e.g. 1.2.5).
+      # * +:scope+ - restricts what is to be considered a list.  Given a symbol, it'll attach
+      #   "_id" (if it hasn't been already) and use that as the foreign key restriction.  You
+      #   can also pass an array to scope by multiple attributes
+      # * +:dependent+ - behavior for cascading destroy.  If set to :destroy, all the child
+      #   objects are destroyed alongside this object by calling their destroy method.  If set
+      #   to :delete_all (default), all the child objects are deleted without calling their
+      #   destroy method.
+      # * +:klass+ - class to use for queries (defaults to self)
+      #
+      # See Mongoid::Acts::NestedSet::ClassMethods for a list of class methods and
+      # Mongoid::Acts::NestedSet::InstanceMethods for a list of instance methods added to
+      # acts_as_nested_set models
+      def acts_as_nested_set(options = {})
+        options = {
+          :parent_field => 'parent_id',
+          :left_field => 'lft',
+          :right_field => 'rgt',
+          :outline_number_field => nil,
+          :dependent => :delete_all, # or :destroy
+          :klass => self,
+        }.merge(options)
 
-      if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
-        options[:scope] = "#{options[:scope]}_id".intern
-      end
+        if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
+          options[:scope] = "#{options[:scope]}_id".intern
+        end
 
-      class_attribute :acts_as_nested_set_options, :instance_writer => false
-      self.acts_as_nested_set_options = options
+        class_attribute :acts_as_nested_set_options, :instance_writer => false
+        self.acts_as_nested_set_options = options
 
-      unless self.is_a?(Document::ClassMethods)
-        include Document
-        include OutlineNumber if outline_number_field_name
+        unless self.is_a?(Document::ClassMethods)
+          include Document
+          include OutlineNumber if outline_number_field_name
 
-        field left_field_name, :type => Integer
-        field right_field_name, :type => Integer
-        field outline_number_field_name, :type => String if outline_number_field_name
-        field :depth, :type => Integer
+          field left_field_name, :type => Integer
+          field right_field_name, :type => Integer
+          field outline_number_field_name, :type => String if outline_number_field_name
+          field :depth, :type => Integer
 
-        has_many   :children, :class_name => self.name, :foreign_key => parent_field_name, :inverse_of => :parent, :order => left_field_name.to_sym.asc
-        # was
-        # belongs_to :parent,   :class_name => self.name, :foreign_key => parent_field_name
-        # became
-        belongs_to :parent,   :class_name => self.name, :foreign_key => parent_field_name, required: false
+          has_many   :children, :class_name => self.name, :foreign_key => parent_field_name, :inverse_of => :parent, :order => left_field_name.to_sym.asc
+          # was
+          # belongs_to :parent,   :class_name => self.name, :foreign_key => parent_field_name
+          # became
+          belongs_to :parent,   :class_name => self.name, :foreign_key => parent_field_name, required: false
 
-        attr_accessor :skip_before_destroy
+          attr_accessor :skip_before_destroy
 
-        define_callbacks :move, :terminator => callback_terminator
+          define_callbacks :move, :terminator => callback_terminator
 
-        before_create  :set_default_left_and_right
-        before_save    :store_new_parent
-        after_save     :move_to_new_parent
-        before_destroy :destroy_descendants
+          before_create  :set_default_left_and_right
+          before_save    :store_new_parent
+          after_save     :move_to_new_parent
+          before_destroy :destroy_descendants
 
-        # no assignment to structure fields
-        [left_field_name, right_field_name].each do |field|
-          module_eval <<-"end_eval", __FILE__, __LINE__
-                  def #{field}=(x)
-                    raise NameError, "Unauthorized assignment to #{field}: it's an internal field handled by acts_as_nested_set code, use move_to_* methods instead.", "#{field}"
-                  end
-          end_eval
-        end
+          # no assignment to structure fields
+          [left_field_name, right_field_name].each do |field|
+            module_eval <<-"end_eval", __FILE__, __LINE__
+                    def #{field}=(x)
+                      raise NameError, "Unauthorized assignment to #{field}: it's an internal field handled by acts_as_nested_set code, use move_to_* methods instead.", "#{field}"
+                    end
+            end_eval
+          end
 
-        scope :roots, lambda {
-          where(parent_field_name => nil).asc(left_field_name)
-        }
-        scope :leaves, lambda {
-          where("this.#{quoted_right_field_name} - this.#{quoted_left_field_name} == 1").asc(left_field_name)
-        }
-        scope :with_depth, lambda { |level|
-          where(:depth => level).asc(left_field_name)
-        }
+          scope :roots, lambda {
+            where(parent_field_name => nil).asc(left_field_name)
+          }
+          scope :leaves, lambda {
+            where("this.#{quoted_right_field_name} - this.#{quoted_left_field_name} == 1").asc(left_field_name)
+          }
+          scope :with_depth, lambda { |level|
+            where(:depth => level).asc(left_field_name)
+          }
 
+        end
       end
     end
   end
+
 end

data/config/initializers/rails_admin_mongoid_patch.rb

@@ -0,0 +1,27 @@
+require 'rails_admin/adapters/mongoid'
+module RailsAdmin
+  module Adapters
+    module Mongoid
+
+      def sort_by(options, scope)
+        return scope unless options[:sort]
+
+        case options[:sort]
+        when String
+          field_name, collection_name = options[:sort].split('.').reverse
+          # if collection_name && collection_name != table_name
+          #   raise('sorting by associated model column is not supported in Non-Relational databases')
+          # end
+        when Symbol
+          field_name = options[:sort].to_s
+        end
+        if options[:sort_reverse]
+          scope.asc field_name
+        else
+          scope.desc field_name
+        end
+      end
+
+    end
+  end
+end