ab_admin 0.3.6 → 0.4.0

data/lib/ab_admin/carrierwave/glue.rb

@@ -5,13 +5,18 @@ module AbAdmin
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def sunrise_uploader(uploader=nil, options={}, &block)
+        def ab_admin_uploader(uploader=nil, options={}, &block)
           options = { mount_on: :data_file_name }.merge(options)
           
           mount_uploader(:data, uploader, options, &block)
           
           validates_processing_of :data
         end
+
+        def sunrise_uploader(*args)
+          ActiveSupport::Deprecation.warn('`sunrise_uploader` is deprecated, use `ab_admin_uploader` instead')
+          ab_admin_uploader(*args)
+        end
         
         def validates_filesize_of(*attr_names)
           validates_with FileSizeValidator, _merge_attributes(attr_names)

data/lib/ab_admin/concerns/admin_addition.rb

@@ -1,37 +1,54 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Concerns
     module AdminAddition
       extend ActiveSupport::Concern
 
       included do
-        scope(:admin, scoped) unless respond_to?(:admin)
-        scope(:base, scoped) unless respond_to?(:base)
-        scope :ids, lambda { |ids| where("#{quoted_table_name}.id IN (?)", AbAdmin.val_to_array(ids).push(0)) }
+        scope(:admin, -> { all }) unless respond_to?(:admin)
+        scope(:base, -> { all }) unless respond_to?(:base)
+        scope :by_ids, lambda { |ids| where("#{quoted_table_name}.id IN (?)", AbAdmin.val_to_array(ids).push(0)) }
 
         class_attribute :batch_actions, instance_writer: false
         self.batch_actions = [:destroy]
       end
 
       module ClassMethods
-        def for_input_token(r, attr='name_ru')
-          {id: r.id, text: r[attr]}
+        def for_input_token(r, attr=nil)
+          text = attr ? r[attr] : (r['name_ru'] || r['name'])
+          {id: r.id, text: text}
         end
       end
 
       def for_input_token
-        {id: id, text: name}
+        {id: id, text: AbAdmin.safe_display_name(self).to_s}
+      end
+
+      def han
+        "#{self.class.model_name.human(count: 1)} ##{self.id} #{AbAdmin.safe_display_name(self)}"
+      end
+
+      def new_changes
+        exclude_attrs = respond_to?(:translated_attribute_names) ? translated_attribute_names.dup : []
+        exclude_attrs << :updated_at
+        changes.except(*exclude_attrs).map { |k, v| [k, v.last] }.to_hash
+      end
+
+      def admin_comments_count_non_zero
+        self[:admin_comments_count].to_i.zero? ? nil : self[:admin_comments_count]
       end
 
       def token_data(method, options={})
         assoc = self.class.reflect_on_association(method)
-        records = Array(send(method))
+        scope = send(method)
+        scope = scope.reorder("#{assoc.options[:through]}.position") if options[:sortable]
+        records = Array(scope)
         data = records.map(&:for_input_token)
         data = {
             pre: data.to_json,
             class: assoc.klass.name,
             multi: assoc.collection?,
-            c: options.delete(:c)
+            c: options.delete(:c),
+            sortable: options.delete(:sortable)
         }
         if options[:geo_order]
           data[:c] ||= {}

data/lib/ab_admin/concerns/asset_human_names.rb

@@ -0,0 +1,23 @@
+module AbAdmin
+  module Concerns
+    module AssetHumanNames
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def asset_human_names(*args)
+          class_attribute :asset_human_names_list, instance_writer: false
+          after_save :make_asset_human_names
+          self.asset_human_names_list = args
+        end
+      end
+
+      def make_asset_human_names
+        asset_human_names_list.each do |assoc|
+          Array(send(assoc)).each do |asset|
+            asset.store_model_filename(self)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ab_admin/concerns/fileuploads.rb

@@ -0,0 +1,102 @@
+module AbAdmin
+  module Concerns
+    module Fileuploads
+      def self.included(base)
+        base.send :extend, SingletonMethods
+      end
+
+      module SingletonMethods
+        # Join ActiveRecord object with uploaded file
+        # Usage:
+        #
+        #   class Article < ActiveRecord::Base
+        #     has_one :picture, as: :assetable, dependent: :destroy
+        #
+        #     fileuploads :picture
+        #   end
+        #
+        #
+        def fileuploads(*args)
+          class_attribute :fileuploads_columns, instance_writer: false
+          self.fileuploads_columns = args
+
+          unless self.is_a?(ClassMethods)
+            include InstanceMethods
+            extend ClassMethods
+
+            attr_accessible :fileupload_guid
+            after_create :fileuploads_update, if: :fileupload_changed?
+          end
+        end
+      end
+
+      module ClassMethods
+        # Update reflection klass by guid
+        def fileupload_update(record_id, guid, method)
+          fileupload_scope(method, guid).update_all(assetable_id: record_id, guid: nil)
+        end
+
+        # Find asset(s) by guid
+        def fileupload_find(method, guid)
+          query = fileupload_scope(method, guid)
+          fileupload_multiple?(method) ? query.to_a : query.first
+        end
+
+        def fileupload_scope(method, guid)
+          assoc = reflect_on_association(method.to_sym)
+          assoc_scope = assoc.scope ? assoc.klass.instance_exec(&assoc.scope) : assoc.klass
+          assoc_scope.where(guid: guid, assetable_type: base_class.name.to_s)
+        end
+
+        # Find class by reflection
+        def fileupload_klass(method)
+          reflect_on_association(method.to_sym).klass
+        end
+
+        def fileupload_multiple?(method)
+          reflect_on_association(method.to_sym).try(:collection?)
+        end
+      end
+
+      module InstanceMethods
+        def fileupload_guid
+          @fileupload_guid ||= AbAdmin.friendly_token
+        end
+
+        def fileupload_guid=(value)
+          @fileupload_changed = true unless value.blank?
+          @fileupload_guid = value.blank? ? nil : value
+        end
+
+        def fileupload_changed?
+          @fileupload_changed === true
+        end
+
+        def fileupload_multiple?(method)
+          self.class.fileupload_multiple?(method)
+        end
+
+        # Find or build new asset object
+        def fileupload_asset(method)
+          if fileuploads_columns.include?(method.to_sym)
+            asset = new_record? ? self.class.fileupload_find(method, fileupload_guid) : send(method)
+            asset ||= send("build_#{method}") if respond_to?("build_#{method}")
+            asset
+          end
+        end
+
+        def fileuploads_columns
+          self.class.fileuploads_columns
+        end
+
+        protected
+
+        def fileuploads_update
+          fileuploads_columns.each do |method|
+            self.class.fileupload_update(id, fileupload_guid, method)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ab_admin/concerns/has_tracking.rb

@@ -0,0 +1,32 @@
+module AbAdmin
+  module Concerns
+    module HasTracking
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :tracks, as: :trackable
+        class_attribute :tracking_enabled
+        self.tracking_enabled = true
+      end
+
+      def track(options={})
+        return unless tracking_enabled?
+        options[:trackable] ||= self
+        options[:owner] ||= user if respond_to?(:user)
+        options[:user] ||= updater if respond_to?(:updater)
+        options[:key] = [self.class.model_name.plural, options[:key]].compact.join('.')
+        tracks.build(options)
+      end
+
+      def track!(*args)
+        track(*args).save!
+      end
+
+      module ClassMethods
+        def tracking_enabled?
+          tracking_enabled && Activity.tracking_enabled
+        end
+      end
+    end
+  end
+end

data/lib/ab_admin/concerns/nested_set.rb

@@ -10,9 +10,9 @@ module AbAdmin
 
         attr_accessor :cached_children
 
-        scope :nested_set, order('lft ASC')
-        scope :reversed_nested_set, order('lft DESC')
-        scope :with_depth, proc { |level| where(depth: level) }
+        scope :nested_set, -> { order('lft ASC') }
+        scope :reversed_nested_set, -> { order('lft DESC') }
+        scope :with_depth, lambda { |level| where(depth: level) }
       end
 
       module ClassMethods
@@ -33,24 +33,24 @@ module AbAdmin
           roots
         end
 
-        def nested_opts(records, mover=nil)
-          mover = nil if mover && !mover.is_a?(self)
+        def nested_opts(records, item=nil)
+          item = nil if item && !item.is_a?(self)
           res = []
           records.each do |r|
-            next if mover && mover.id == r.id
+            next if item && item.id == r.id
             res << ["#{'–' * r.depth} #{AbAdmin.display_name(r)}", r.id]
           end
           res
         end
 
-        def nested_opts_with_parent(records, mover=nil)
-          mover = nil if mover && !mover.is_a?(self)
+        def nested_opts_with_parent(records, item=nil)
+          item = nil if item && !item.is_a?(self)
           res = []
           parents = []
           records.each do |r|
             r.root? ? parents = [] : parents.reject! { |p| p.depth >= r.depth }
 
-            unless mover && mover.id == r.id
+            unless item && item.id == r.id
               res << ["#{parents.map { |c| "#{AbAdmin.display_name(c)} - " }.join} <b>#{AbAdmin.display_name(r)}</b>", r.id]
             end
 

data/lib/ab_admin/concerns/silencer.rb

@@ -3,7 +3,7 @@ module AbAdmin
   module Concerns
     module Silencer
 
-      def no_timestamps(&block)
+      def no_timestamps
         original_setting = ActiveRecord::Base.record_timestamps
         ActiveRecord::Base.record_timestamps = false
         begin
@@ -13,13 +13,13 @@ module AbAdmin
         end
       end
 
-      def no_versions(&block)
-        original_setting = PaperTrail.enabled?
-        PaperTrail.enabled = false
+      def no_versions
+        original_setting = Track.tracking_enabled
+        Track.tracking_enabled = false
         begin
           yield
         ensure
-          PaperTrail.enabled = original_setting
+          Track.tracking_enabled = original_setting
         end
       end
 

data/lib/ab_admin/concerns/utilities.rb

@@ -17,8 +17,8 @@ module AbAdmin
           Rails.cache.fetch("by_class_#{name}_#{scope}", expires_in: 60) { unscoped.send(scope).maximum(:updated_at).to_i }
         end
 
-        def full_truncate
-          destroy_all
+        def full_truncate(with_destroy=true)
+          destroy_all if with_destroy
           truncate!
           const_get(:Translation).truncate! if respond_to?(:translates?) && translates?
         end
@@ -56,28 +56,24 @@ module AbAdmin
           end
         end
 
-        def update_counter_column(col, ass)
-          assoc = reflect_on_association(ass)
+        def update_counter_column(col, assoc_method)
+          assoc = assoc_count = reflect_on_association(assoc_method)
           if assoc
+            add_from = ''
+            add_cond = ['1=1']
             if assoc.options[:through]
               assoc_count = reflect_on_association(assoc.options[:through])
-              if assoc.klass.quoted_table_name == quoted_table_name
-                add_from = ''
-                add_cond = '1=1'
-              else
+              unless assoc.klass.table_name.to_s == table_name.to_s
                 add_from = "INNER JOIN #{assoc.klass.quoted_table_name} ON #{assoc_count.klass.quoted_table_name}.#{assoc.foreign_key} = #{assoc.klass.quoted_table_name}.id"
-                add_cond = assoc.sanitized_conditions || '1=1'
               end
-            else
-              assoc_count = assoc
-              add_from = ''
-              add_cond = assoc.sanitized_conditions || '1=1'
             end
+            add_cond << "#{assoc.klass.quoted_table_name}.#{assoc.type} = '#{name}'" if assoc.type
+            add_cond += assoc.klass.instance_exec(&assoc.scope).where_values.map(&:to_sql) if assoc.scope
             count_klass = assoc_count.klass
             query = <<-SQL
                 UPDATE #{quoted_table_name} SET #{col} = (SELECT COUNT(#{count_klass.quoted_table_name}.id)
                   FROM #{count_klass.quoted_table_name} #{add_from}
-                  WHERE #{quoted_table_name}.id = #{count_klass.quoted_table_name}.#{assoc_count.foreign_key} AND #{add_cond})
+                  WHERE #{quoted_table_name}.id = #{count_klass.quoted_table_name}.#{assoc_count.foreign_key} AND #{add_cond.join(' AND ')})
             SQL
             connection.execute(query)
           end
@@ -103,10 +99,18 @@ module AbAdmin
 
         def generate_token(column=:guid)
           loop do
-            token = ::Devise.friendly_token
+            token = AbAdmin.friendly_token
             break token unless to_adapter.find_first({column => token})
           end
         end
+
+        def friendly_find(id_param)
+          if respond_to?(:friendly)
+            friendly.find(id_param)
+          else
+            find(id_param)
+          end
+        end
       end
 
       def compare_key
@@ -115,8 +119,16 @@ module AbAdmin
 
       def generate_token(column=:guid)
         begin
-          self[column] = ::Devise.friendly_token
+          self[column] = AbAdmin.friendly_token
         end while self.class.exists?(column => self[column])
+        self[column]
+      end
+
+      def ensure_token(column=:guid)
+        return self[column] if self[column].present?
+        generate_token(column)
+        update_column(column, self[column]) unless new_record?
+        self[column]
       end
     end
 

data/lib/ab_admin/concerns/validations.rb

@@ -5,7 +5,7 @@ module AbAdmin
         def validate_each(record, attribute, value)
           ::I18n.available_locales.each do |l|
             next if record.read_attribute(attribute, locale: l).blank?
-            records_scope = record.class.const_get(:Translation).where("#{record.class.model_name.foreign_key} != #{record.id || 0}")
+            records_scope = record.class.const_get(:Translation).where("#{record.class.model_name.singular}_id != #{record.id || 0}")
             same = records_scope.where(name: record.read_attribute(attribute, locale: l), locale: l.to_s).exists?
             record.errors.add("#{attribute}_#{l}", :taken) if same
           end

data/lib/ab_admin/config/base.rb

@@ -57,6 +57,10 @@ module AbAdmin
       end
     end
 
+    class ModalForm < Form
+      self.partial_name = 'modal_form'
+    end
+
     class Show < BaseBuilder
       self.partial_name = 'show_table'
 
@@ -86,12 +90,16 @@ module AbAdmin
     end
 
     class Field
-      attr_reader :name, :options, :data
+      attr_reader :name, :options, :block
 
       def initialize(name, options={}, &block)
         @name = name
         @options = options
-        @data = block_given? ? block : name.to_sym
+        @block = block
+      end
+
+      def data
+        @block || name.to_sym
       end
 
       def group?

data/lib/ab_admin/controllers/callbacks.rb

@@ -14,7 +14,7 @@ module AbAdmin
       #  run_build_callbacks object
       #  object
       #end
-      #
+
       def create_resource(object)
         run_create_callbacks object do
           save_resource(object)
@@ -44,7 +44,7 @@ module AbAdmin
       # Simple callback system. Implements before and after callbacks for
       # use within the controllers.
       #
-      # We didn't use the ActiveSupport callbacks becuase they do not support
+      # We didn't use the ActiveSupport callbacks because they do not support
       # passing in any arbitrary object into the callback method (which we
       # need to do)