ab_admin 0.6.1 → 0.7.0

data/lib/ab_admin/views/form_builder.rb

@@ -31,12 +31,18 @@ module AbAdmin
           end
         end
 
+        attribute_name = "#{attribute_name}_#{options[:locale]}" if options[:locale]
+
+        options[:disabled] = disabled_attribute?(attribute_name) unless options.has_key?(:disabled)
+
         case options[:as]
           when :map
             title = options[:title] || I18n.t("admin.#{attribute_name}", default: object.class.han(attribute_name))
             prefix = options[:prefix] || object.class.model_name.singular
-            data_fields = [:lat, :lon, :zoom].map { |attr| hidden_field(attr) }.join.html_safe
-            return template.input_set(title) { data_fields + geo_input(prefix, options[:js_options]) }
+            data_fields = [:lat, :lon, :zoom].map { |attr| hidden_field(attr) }.join unless options[:disabled]
+            options[:js_options] ||= {}
+            options[:js_options][:disabled] = options[:disabled]
+            return template.input_set(title) { data_fields.to_s.html_safe + geo_input(prefix, options[:js_options]) }
           when :token
             options[:label] = object.class.han(attribute_name.to_s.sub(/^token_|_id$/, '')) unless options.key?(:label)
           when :association, :tree_select
@@ -49,31 +55,56 @@ module AbAdmin
             return template.render 'admin/shared/inputs/checkbox_tree', attribute_name: attribute_name, reflection: reflection, f: self
         end
 
-        attribute_name = "#{attribute_name}_#{options[:locale]}" if options[:locale]
-
         super(attribute_name, options, &block)
       end
 
+      def input_field(attribute_name, options = {})
+        options[:disabled] = disabled_attribute?(attribute_name) unless options.has_key?(:disabled)
+        super(attribute_name, options)
+      end
+
+      def disable_all
+        @disable_all = true
+        @defaults ||= {}
+        @defaults[:disabled] = true
+      end
+
+      def disable_not_accessible_for(roles)
+        ActiveSupport::Deprecation.warn('#disable_not_accessible_for is deprecated without replacement')
+        @disable_not_accessible_for = roles
+      end
+
+      def disabled_attribute?(attribute_name)
+        @disable_all
+        # return true if @disable_all
+        # return unless @disable_not_accessible_for
+        # @accessible_attributes ||= object.class.attr_accessible.values_at(*@disable_not_accessible_for).map(&:to_a).flatten
+        # !@accessible_attributes.include?(attribute_name.to_s)
+      end
+
       def render_dsl_node(node, options={})
         input node.name, node.options.merge(options), &node.block
       end
 
       def link_to_add_assoc(assoc, options={})
+        return if @disable_all
         model = @object.class.reflect_on_association(assoc).klass
         title = [@template.icon('plus', true), I18n.t('admin.add'), options[:title] || model.model_name.human].join(' ').html_safe
         link_to_add title, assoc, class: "btn btn-primary #{options[:class]}"
       end
 
       def link_to_remove_assoc
+        return if @disable_all
         link_to_remove @template.icon('trash', true) + I18n.t('admin.delete'), class: 'btn btn-danger btn-mini pull-right'
       end
 
-      def locale_tabs(&block)
-        loc_html = {}
-        Globalize.available_locales.each do |l|
-          loc_html[l] = template.capture { block.call(l) }
+      def locale_tabs(options={}, &block)
+        locale_html = {}
+        options[:locales] ||= Globalize.available_locales
+        options[:locales].each do |l|
+          locale_html[l] = template.capture { block.call(l) }
         end
-        template.render 'admin/shared/locale_tabs', loc_html: loc_html
+        template.render 'admin/shared/locale_tabs', locale_html: locale_html, locales: options[:locales]
       end
 
       def save_buttons
@@ -86,7 +117,7 @@ module AbAdmin
         <<-HTML.html_safe
         <script src="//maps.googleapis.com/maps/api/js?sensor=false&libraries=places&language=#{I18n.locale}" type="text/javascript"></script>
         <div class="geo_input" id="#{prefix}_geo_input">
-          <div class="control-group">
+          <div class="control-group #{'hidden' if js_options[:disabled]}">
             <label class="control-label" for="#{input_name}">#{I18n.t('admin.geo_autocomplete')}</label>
             <div class="controls">
               <input type="text" name="#{input_name}" id="#{input_name}" class="geo_ac string">

data/lib/ab_admin/views/helpers.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Views
     module Helpers
@@ -80,7 +79,6 @@ module AbAdmin
 
         output_buffer
       end
-
     end
   end
 end

data/lib/ab_admin/views/inputs/uploader_input.rb

@@ -80,6 +80,7 @@ module AbAdmin
             sortable: @options[:sortable],
             edit_meta: @options[:edit_meta],
             crop: @options[:crop],
+            disabled: @options[:disabled],
             fileupload: {
               url: AbAdmin.fileupload_url,
               maxNumberOfFiles: @options[:max_files],

data/lib/ab_admin/views/search_form_builder.rb

@@ -5,15 +5,19 @@ module AbAdmin
                :text_field_tag, :check_box_tag, :radio_button_tag, :label_tag, :select_tag,
                :options_for_select, :options_from_collection_for_select, :hidden_field_tag, to: :@template
 
+      alias_method :builder_options, :options
+
       def input(attr, options={})
         field_type = field_type(attr, options)
-        content_tag :div, class: "clearfix #{field_type} #{options[:wrapper_class]}" do
+        options[:wrapper_html] ||= {}
+        options[:wrapper_html][:class] = "clearfix #{field_type} #{options[:wrapper_html][:class]}"
+        content_tag :div, options[:wrapper_html] do
           public_send("#{field_type}_field", attr, options)
         end
       end
 
       def select_field(attr, options={})
-        label(attr, options[:label]) + content_tag(:div, class: 'controls') do
+        conditional_wrapper attr, options do
           param = options[:param] || "#{options[:value_attr] || attr}_eq"
 
           if options[:collection].is_a?(Proc)
@@ -27,19 +31,26 @@ module AbAdmin
           end
 
           options[:input_html] ||= {}
+          options[:input_html][:id] = "q_#{attr}"
+
           if options[:fancy] || collection.length > 30
             options[:input_html][:class] = [options[:input_html][:class], 'fancy_select'].join(' ')
           end
 
-          html_options = options[:input_html].merge(include_blank: true, id: "q_#{attr}")
-          select_tag("q[#{param}]", options_for_select(collection, params[:q][param]), html_options)
+          if options[:input_html][:placeholder]
+            options[:input_html][:include_blank] = false
+            options[:input_html][:prompt] ||= options[:input_html][:placeholder]
+          else
+            options[:input_html][:include_blank] = true
+          end
+          select_tag("q[#{param}]", options_for_select(collection, params[:q][param]), options[:input_html])
         end
       end
 
       def ac_select_field(attr, options={})
         klass = options[:klass]
         options[:param] ||= "#{options[:value_attr] || attr}_eq"
-        pre_select = params.val(:q, options[:param]) ? klass.where(id: params[:q][options[:param]]).map(&:for_input_token) : []
+        pre_select = params[:q].try!(:[], options[:param]) ? klass.where(id: params[:q][options[:param]]).map(&:for_input_token) : []
         options[:input_html] ||= {}
         options[:input_html].deep_merge! class: 'fancy_select', data: {class: klass.name, pre: pre_select.to_json}
         string_field attr, options
@@ -53,8 +64,19 @@ module AbAdmin
         end
       end
 
+      def conditional_wrapper(attr, options, &block)
+        if builder_options[:compact_labels]
+          options[:input_html] ||= {}
+          options[:input_html][:placeholder] ||= extract_label(attr, options)
+          wrapper_html = {'class' => 'controls js-tooltip', 'data-placement' => 'left', 'title' => options[:input_html][:placeholder]}
+          content_tag(:div, wrapper_html, &block)
+        else
+          label(attr, options[:label]) + content_tag(:div, class: 'controls', &block)
+        end
+      end
+
       def string_field(attr, options={})
-        label(attr, options[:label]) + content_tag(:div, class: 'controls') do
+        conditional_wrapper attr, options do
           param = options[:param] || "#{options[:value_attr] || attr}_cont"
           options[:input_html] ||= {}
           options[:input_html][:id] = "q_#{attr}"
@@ -88,6 +110,7 @@ module AbAdmin
         end + label(attr, options[:label], class: 'right-label')
       end
 
+      # Rails 4.2: Should be used only for string columns because of https://github.com/activerecord-hackery/ransack/issues/617
       def presence_field(attr, options={})
         yes_no_field(attr, options.merge(predicates: {yes: %w(present 1), no: %w(present 0)}))
       end
@@ -96,7 +119,6 @@ module AbAdmin
         yes_no_field(attr, options.merge(predicates: {yes: %w(null 0), no: %w(null 1)}))
       end
 
-
       def hidden_field(attr, options={})
         hidden_field_tag("q[#{attr}_eq]", options[:value], options)
       end
@@ -106,6 +128,10 @@ module AbAdmin
         super(attr, text, options)
       end
 
+      def extract_label(attr, options)
+        options[:label].presence || @object.klass.han(attr)
+      end
+
       def field_type(attr, options={})
         return options[:as].to_sym if options[:as]
         return :string if attr =~ /^translations_/

data/lib/generators/ab_admin/ckeditor_assets/ckeditor_assets_generator.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Generators
     class CkeditorAssetsGenerator < Rails::Generators::Base

data/lib/generators/ab_admin/glob/glob_generator.rb

@@ -28,7 +28,7 @@ module AbAdmin
 
       def models
         @models ||= begin
-          all_translated.reject { |m| conn.table_exists? m.translations_table_name }
+          all_translated.reject { |m| conn.data_source_exists? m.translations_table_name }
         end
       end
 
@@ -41,7 +41,7 @@ module AbAdmin
           next if file =~ /(?:concerns|shared)\//
           require file
         end
-        ActiveRecord::Base.subclasses.find_all { |model| model.table_exists? }
+        ActiveRecord::Base.subclasses.find_all { |model| model.connection.data_source_exists?(model.table_name) }
       end
 
       def conn

data/lib/generators/ab_admin/glob/templates/migration.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def up
     <%- models.each do |m| -%>
     <%= m.name %>.create_translation_table! <%= model_attrs[m.name] %>

data/lib/generators/ab_admin/install/install_generator.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Generators
     class InstallGenerator < Rails::Generators::Base

data/lib/generators/ab_admin/install/templates/config/seeds.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 def insert_user
   User.truncate!
   password = Rails.env.production? ? Devise.friendly_token : (1..8).to_a.join

data/lib/generators/ab_admin/install/templates/helpers/admin/structures_helper.rb

@@ -2,7 +2,7 @@ module Admin::StructuresHelper
 
   def edit_structure_record_path(structure)
     case structure.structure_type
-      when StructureType.static_page
+      when StructureType.static_page, StructureType.main
         if structure.static_page
           edit_admin_structure_static_page_path(structure_id: structure.id)
         else
@@ -10,8 +10,6 @@ module Admin::StructuresHelper
         end
       when StructureType.posts
         '#'
-      when StructureType.main
-        '#'
       when StructureType.redirect
         edit_admin_structure_path(structure)
       when StructureType.group
@@ -20,5 +18,4 @@ module Admin::StructuresHelper
         '#'
     end
   end
-
 end

data/lib/generators/ab_admin/install/templates/models/admin_comment.rb

@@ -1,5 +1,3 @@
-class AdminComment < ActiveRecord::Base
+class AdminComment < ApplicationRecord
   include AbAdmin::Models::AdminComment
-
-  attr_accessible :body, :resource_id, :resource_type
 end

data/lib/generators/ab_admin/install/templates/models/asset.rb

@@ -1,12 +1,10 @@
-class Asset < ActiveRecord::Base
+class Asset < ApplicationRecord
   include AbAdmin::Models::Asset
 
-  attr_accessible :data, :is_main, :original_name, :base_filename
   translates :name, :alt
-  attr_accessible *all_translated_attribute_names
 
   validates_presence_of :data
-	
-	default_scope -> { order("#{quoted_table_name}.sort_order") }
+
+  default_scope -> { order("#{quoted_table_name}.sort_order") }
 
 end

data/lib/generators/ab_admin/install/templates/models/header.rb

@@ -1,9 +1,5 @@
-class Header < ActiveRecord::Base
-
-  attr_accessible :title, :keywords, :description, :h1, :seo_block
-
+class Header < ApplicationRecord
   translates :title, :keywords, :description, :h1, :seo_block, fallbacks_for_empty_translations: false
-  attr_accessible *all_translated_attribute_names
 
   include AbAdmin::Models::Header
 

data/lib/generators/ab_admin/install/templates/models/static_page.rb

@@ -1,6 +1,4 @@
-class StaticPage < ActiveRecord::Base
-  attr_accessible :structure_id, :title, :content, :kind, :is_visible
-
+class StaticPage < ApplicationRecord
   belongs_to :structure
 
   has_many :pictures, as: :assetable, dependent: :destroy
@@ -12,6 +10,5 @@ class StaticPage < ActiveRecord::Base
 
   fileuploads :pictures, :attachment_files
   translates :title, :content
-  attr_accessible *all_translated_attribute_names
 
 end

data/lib/generators/ab_admin/install/templates/models/structure.rb

@@ -1,15 +1,11 @@
-class Structure < ActiveRecord::Base
+class Structure < ApplicationRecord
   include AbAdmin::Models::Structure
 
-  attr_accessible :structure_type_id, :position_type_id, :parent_id, :title, :redirect_url, :is_visible,
-                  :structure_type, :position_type, :slug, :parent
-
   has_one :picture, -> { where(is_main: true) }, as: :assetable, dependent: :destroy
   has_many :pictures, -> { where(is_main: false) }, as: :assetable, dependent: :destroy
 
   fileuploads :picture
   translates :title, :redirect_url
-  attr_accessible *all_translated_attribute_names
 
   include AbAdmin::Concerns::AdminAddition
   simple_slug :title

data/lib/generators/ab_admin/install/templates/models/track.rb

@@ -1,5 +1,4 @@
-class Track < ActiveRecord::Base
+class Track < ApplicationRecord
   include AbAdmin::Models::Track
 
-  attr_accessible :key, :name, :user, :owner, :trackable, :trackable_changes, :parameters
 end

data/lib/generators/ab_admin/install/templates/models/user.rb

@@ -1,15 +1,8 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   devise :database_authenticatable, :confirmable, :lockable,
          :recoverable, :rememberable, :trackable, :validatable, :registerable,
          :encryptable, encryptor: :sha512
 
-  attr_accessible :password, :password_confirmation, :email, :remember_me,
-                  :login, :first_name, :last_name, :patronymic, :phone, :skype, :web_site, :address, :birthday,
-                  :time_zone, :locale, :bg_color, :gender
-
-
-  attr_accessible :user_role_id, as: :admin
-
   include AbAdmin::Concerns::AdminAddition
   include AbAdmin::Models::User
 
@@ -26,5 +19,4 @@ class User < ActiveRecord::Base
     return false if persisted? && password.blank?
     super
   end
-
 end

data/lib/generators/ab_admin/install/templates/uploaders/attachment_file_uploader.rb

@@ -1,5 +1,5 @@
 class AttachmentFileUploader < AbAdmin::CarrierWave::BaseUploader
-  def extension_white_list
+  def extension_whitelist
     %w(pdf doc docx xls xlsx ppt pptx jpg jpeg gif png zip rar csv)
   end
 end

data/lib/generators/ab_admin/install/templates/uploaders/avatar_uploader.rb

@@ -6,7 +6,7 @@ class AvatarUploader < AbAdmin::CarrierWave::BaseUploader
     process resize_to_fill: [80, 80, 'North']
   end
 
-  def extension_white_list
+  def extension_whitelist
     %w(jpg jpeg gif png)
   end
 

data/lib/generators/ab_admin/install/templates/uploaders/picture_uploader.rb

@@ -7,7 +7,7 @@ class PictureUploader < AbAdmin::CarrierWave::BaseUploader
     process resize_to_fill: [80, 80]
   end
 
-  def extension_white_list
+  def extension_whitelist
     %w(jpg jpeg gif png)
   end
 end

data/lib/generators/ab_admin/model/templates/resource.erb

@@ -1,4 +1,5 @@
 class AbAdmin<%= model.name %> < AbAdmin::AbstractResource
+  permitted_params :all
 
 <% if model.respond_to?(:acts_as_nested_set_options) -%>
   settings index_view: 'tree'

data/lib/generators/template.rb

@@ -1,7 +1,8 @@
+gem 'jquery-rails'
 gem 'rails-i18n'
 gem 'slim'
 
-gem 'inherited_resources'
+gem 'inherited_resources', github: 'activeadmin/inherited_resources'
 gem 'has_scope'
 gem 'rack-pjax'
 
@@ -9,67 +10,60 @@ gem 'devise'
 gem 'devise-encryptable'
 gem 'cancancan'
 
-gem 'protected_attributes'
+gem 'protected_attributes', github: 'leschenko/protected_attributes'
 gem 'galetahub-enum_field', require: 'enum_field'
 gem 'ransack'
 gem 'simple_slug'
 gem 'awesome_nested_set'
-gem 'globalize', '~> 5.0.0'
+gem 'globalize', github: 'globalize/globalize'
 
 gem 'carrierwave'
 gem 'mini_magick'
+# 3.0 is broken -  creates new `configatron` instance in every namespace
 gem 'configatron', '~> 2.13'
 gem 'simple_form'
+gem 'coffee-rails'
+gem 'sass-rails'
+gem 'uglifier'
 gem 'will_paginate'
 gem 'will_paginate-bootstrap'
 gem 'bootstrap-sass'
-gem 'bootstrap-wysihtml5-rails'
-gem 'select2-rails'
+gem 'bootstrap-wysihtml5-rails', '~> 0.3.1.24'
+gem 'select2-rails', '~> 3.5.9.3'
 gem 'jquery-fileupload-rails'
 gem 'fancybox2-rails'
 gem 'i18n-js'
 
 gem 'ruby-progressbar'
-gem 'ruby2xlsx'
 gem 'rest-client'
 gem 'nested_form', '~> 0.2.2'
 
-gem 'ab_admin', github: 'leschenko/ab_admin', branch: 'master'
+install_ckeditor = yes?('Install ckeditor?')
+gem 'ckeditor' if install_ckeditor
 
-ckeditor = yes?('Install ckeditor?')
+gem 'ab_admin', github: 'leschenko/ab_admin', branch: 'rails-5'
 
-if ckeditor
-  gem 'ckeditor'
+gem_group :development, :test do
+  gem 'rspec-rails'
+  gem 'factory_girl_rails'
+  gem 'launchy'
+  gem 'forgery'
+  gem 'byebug'
 end
 
-gem_adds = yes?('Add additional gems (mostly dev and testing tools)?')
-
-if gem_adds
-  # non dependency gems
-  gem 'dalli'
-  gem 'exception_notification'
-  gem 'redis-actionpack'
-
-  gem_group :development, :test do
-    gem 'quiet_assets'
-    gem 'rspec-rails'
-    gem 'factory_girl_rails'
-    gem 'forgery'
-  end
-
-  gem_group :development do
-    gem 'slim-rails'
-    gem 'annotate'
-    gem 'letter_opener'
-    gem 'better_errors'
-    gem 'binding_of_caller'
-  end
-
-  gem_group :test do
-    gem 'database_cleaner'
-    gem 'fuubar'
-    gem 'guard-rspec'
-  end
+gem_group :test do
+  gem 'capybara'
+  gem 'database_cleaner'
+  gem 'connection_pool'
+  gem 'fuubar'
+  gem 'guard-rspec'
+  gem 'rb-fsevent', require: false
+  gem 'growl', require: false
+end
+
+gem_group :development do
+  gem 'better_errors'
+  gem 'binding_of_caller'
 end
 
 # run bundle install
@@ -77,14 +71,10 @@ run('bundle install')
 #run('bundle install --path=vendor/bundle --binstubs')
 
 # create database
-if yes?('Create database?')
-  rake('db:create')
-end
+rake('db:create') if yes?('Create database?')
 
 # run default generators
-if ckeditor
-  generate('ckeditor:install', '--orm=active_record', '--backend=carrierwave')
-end
+generate('ckeditor:install', '--orm=active_record', '--backend=carrierwave') if install_ckeditor
 generate('devise:install')
 generate('simple_form:install', '--bootstrap')
 generate('ab_admin:install')
@@ -93,26 +83,16 @@ generate('ab_admin:install')
 rake('ab_admin:install:migrations')
 
 # init git
-if yes?('Init empty git?')
-  git(:init)
-end
+git(:init) if yes?('Init empty git?')
 
 # create && migrate database
-if yes?('Run db:migrate?')
-  rake('db:migrate')
-end
+rake('db:migrate') if yes?('Run db:migrate?')
 
 # run db seed
-if yes?('Run db:seed?')
-  rake('db:seed')
-end
+rake('db:seed') if yes?('Run db:seed?')
 
 # copy ckeditor assets to public/javascripts
-if ckeditor
-  generate('ab_admin:ckeditor_assets')
-end
+generate('ab_admin:ckeditor_assets') if install_ckeditor
 
 # run db seed
-if yes?('Export i18n js locales?')
-  rake('i18n:js:export')
-end
+rake('i18n:js:export') if yes?('Export i18n js locales?')