ab_admin 0.3.6 → 0.4.0

data/lib/ab_admin/models/user.rb

@@ -6,9 +6,9 @@ module AbAdmin
       included do
         has_one :avatar, as: :assetable, dependent: :destroy, autosave: true
 
-        scope :managers, where(user_role_id: [::UserRoleType.admin.id, ::UserRoleType.moderator.id])
-        scope :active, where(trust_state: ::UserState.active.id)
-        scope :admin, includes(:avatar)
+        scope :managers, -> { where(user_role_id: [::UserRoleType.admin.id, ::UserRoleType.moderator.id]) }
+        scope :active, -> { where(locked_at: nil) }
+        scope :admin, -> { includes(:avatar) }
 
         after_initialize :init
         before_validation :generate_login
@@ -17,18 +17,6 @@ module AbAdmin
         validate :check_role
 
         enumerated_attribute :user_role_type, id_attribute: :user_role_id, class: ::UserRoleType
-        enumerated_attribute :trust_state_type, id_attribute: :trust_state, class: ::UserState
-      end
-
-      def set_default_role
-        self.user_role_id ||= ::UserRoleType.default.id
-      end
-
-      def generate_password!
-        raw_password = Rails.env.test? ? '654321' : ::Devise.friendly_token[0..7]
-        self.password = self.password_confirmation = raw_password
-        self.save(validate: false)
-        raw_password
       end
 
       def name
@@ -39,37 +27,30 @@ module AbAdmin
         [first_name.presence, last_name.presence].compact.join(' ')
       end
 
-      def activate
-        self.trust_state = ::UserState.active.id
-        self.locked_at = nil
-      end
-
-      def activate!
-        confirm!
-        activate
-        save
-      end
-
       def suspend!
-        self.update_attribute(:trust_state, ::UserState.suspended.id)
-      end
-
-      def delete!
-        self.update_attribute(:trust_state, ::UserState.deleted.id)
+        update_attribute(:locked_at, Time.now.utc)
       end
 
-      def unsuspend!
-        self.update_attribute(:trust_state, ::UserState.active.id)
+      def activate!
+        confirm! unless confirmed?
+        unlock_access! if access_locked?
       end
 
-      def deleted?
-        trust_state == ::UserState.deleted.id
+      def generate_password!
+        raw_password = AbAdmin.test_env? ? '654321' : AbAdmin.friendly_token
+        self.password = self.password_confirmation = raw_password
+        self.save(validate: false)
+        raw_password
       end
 
       def moderator?
         has_role?(:admin) || has_role?(:moderator)
       end
 
+      def admin_access?
+        moderator?
+      end
+
       def default?
         has_role?(:default)
       end
@@ -82,20 +63,8 @@ module AbAdmin
         user_role_type.code == role_name
       end
 
-      def pending?
-        trust_state == ::UserState.pending.id
-      end
-
-      def trusted?
-        self.trust_state == ::UserState.active.id
-      end
-
-      def active_for_authentication?
-        super && trusted?
-      end
-
-      def inactive_message
-        trusted? ? super : :unconfirmed
+      def set_default_role
+        self.user_role_id ||= ::UserRoleType.default.id
       end
 
       protected

data/lib/ab_admin/utils.rb

@@ -5,8 +5,8 @@ module AbAdmin
     autoload :Logger, 'ab_admin/utils/logger'
     autoload :Mysql, 'ab_admin/utils/mysql'
 
-    def load_files!(path = 'lib/utils')
-      Dir[Rails.root.join("#{path}/**/*.rb")].each do |path|
+    def load_files!(base_path = 'lib/utils')
+      Dir[Rails.root.join("#{base_path}/**/*.rb")].each do |path|
         require_dependency path
       end
     end
@@ -45,7 +45,7 @@ module AbAdmin
     end
 
     def l_path(locale=nil)
-      return '' unless locale
+      locale ||= I18n.locale
       locale == I18n.default_locale ? '' : "/#{locale}"
     end
 
@@ -55,8 +55,8 @@ module AbAdmin
       Rack::Utils.escape_html(raw_html.no_html.squish)
     end
 
-    #AbAdmin.normalize_html('<!--das asd as as as--><script>asd</script><div>dasd</div><p>asdasd</p>')
-    #=> "<p>dasd</p><p>asdasd</p>"
+    # html like: '<!-- html comment --><script>script content</script><div>div content</div><p>p content</p>'
+    # normalized to: "<p>div content</p><p>p content</p>"
     def normalize_html(raw_html)
       @@sanitizer ||= Sanitizer.new
       @@sanitizer.normalize_html(raw_html)
@@ -67,7 +67,8 @@ module AbAdmin
     end
 
     def full_url(path)
-      host = Rails.application.config.action_mailer.default_url_options[:host] || 'www.example.com'
+      return path if path =~ %r{^(http|//)}
+      host = AbAdmin.base_url || Rails.application.config.action_mailer.default_url_options[:host] || 'www.example.com'
       "http://#{host}#{path}"
     end
 
@@ -101,12 +102,13 @@ module AbAdmin
     end
 
     def display_name(resource)
+      return unless resource
       resource.send(display_name_method_for(resource))
     end
 
     def safe_display_name(resource)
       return unless display_name_method_for(resource)
-      resource.send(display_name_method_for(resource))
+      display_name(resource)
     end
 
     def pretty_data(object)
@@ -126,5 +128,12 @@ module AbAdmin
       end
     end
 
+    def test_env?
+      Rails.env.test? || Rails.env.cucumber?
+    end
+
+    def friendly_token(n=10)
+      SecureRandom.base64(16).tr('+/=', 'xyz').first(n)
+    end
   end
 end

data/lib/ab_admin/utils/logger.rb

@@ -2,17 +2,21 @@ module AbAdmin
   module Utils
     module Logger
 
-      class ShortFormatter < ::Logger::Formatter
-        def call(severity, time, progname, msg)
-          "[#{time.strftime('%Y-%m-%dT%H:%M:%S')}] #{msg}\n"
+      class ExtendedLogger < ::Logger
+        def exception(e, options={})
+          message = "#{e.message} #{"DATA:#{options[:data].inspect}" if options && options[:data]}"
+          backtrace = e.backtrace.map { |l| "#{' ' * 2}#{l}" }.join("\n")
+          error("#{message}\n#{backtrace}\n\n")
+        end
+
+        def reopen
+          @logdev = LogDevice.new(@logdev.filename)
         end
       end
 
       def self.for_file(filename)
-        logfile = File.open(Rails.root.join('log', filename), 'a+')
-        logfile.sync = true
-        logger = ::Logger.new(logfile)
-        logger.formatter = ShortFormatter.new
+        logger = ExtendedLogger.new(Rails.root.join('log', filename))
+        logger.formatter = ::Logger::Formatter.new
         logger
       end
 

data/lib/ab_admin/utils/mysql.rb

@@ -12,6 +12,16 @@ module AbAdmin
           transaction { connection.execute("TRUNCATE TABLE #{quoted_table_name};") }
         end
 
+        # remove duplicate records by columns
+        def remove_duplicates(*cols)
+          conds = cols.map { |col| "#{table_name}.#{col} IS NOT NULL AND #{table_name}.#{col} = t.#{col}" }.join(' AND ')
+          query = <<-SQL
+            DELETE FROM #{table_name} USING #{table_name}, #{table_name} AS t WHERE #{table_name}.id < t.id AND #{conds}
+          SQL
+          connection.execute(query)
+        end
+
+
         # Disables key updates for model table
         def disable_keys
           connection.execute("ALTER TABLE #{quoted_table_name} DISABLE KEYS")

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -38,13 +38,13 @@ module AbAdmin
         data = {
             type: options[:type],
             source: options[:source].try(:to_json),
-            model: resource_class.model_name.singular,
-            url: resource_path(item),
+            model: item.class.model_name.singular,
+            url: options[:url] || "/admin/#{item.class.model_name.plural}/#{item.id}",
             name: attr,
             value: options[:value] || item[attr],
             title: options[:title] || item[attr]
         }
-        link_to admin_pretty_data(data[:title].to_s).html_safe, '#', class: 'editable', data: data
+        link_to admin_pretty_data(data[:title].to_s).html_safe, '#', class: "editable #{options[:class]}", data: data.update(options[:data] || {})
       end
 
       def options_for_ckeditor(options = {})
@@ -60,14 +60,24 @@ module AbAdmin
         items.map { |item| admin_tree_item(item) }.join.html_safe
       end
 
-      def layout_css
+      def admin_layout_css
         css = []
         css << 'content_with_sidebar' if settings[:sidebar] || content_for?(:sidebar)
-        css << 'well' if settings[:well]
-        css << "#{settings[:index_view]}_view"
+        css << 'well' if settings[:well] && current_index_view != 'tree'
+        css << "#{current_index_view}_view"
         css
       end
 
+      def admin_title
+        base = @breadcrumbs ? @breadcrumbs.map_val(:name).reverse : []
+        base << @page_title || 'Ab Admin'
+        base.join(' - ')
+      end
+
+      def include_fv
+        "<script type='text/javascript'>window.fv = #{fv.to_h.to_json}</script>".html_safe
+      end
+
       def admin_comments
         render 'admin/admin_comments/comments'
       end
@@ -107,7 +117,8 @@ module AbAdmin
         image = item.send(options[:assoc])
         return nil unless image
         version = options[:version] || image.class.thumb_size
-        popover_data = {content: "<img class='image_link_popover popover_#{options[:assoc]}' src='#{image.url}'></img>", title: AbAdmin.display_name(item)}
+        popover_content = "<img class='image_link_popover popover_#{options[:assoc]}' src='#{image.url(options[:full_version])}'></img>"
+        popover_data = {content: popover_content, title: AbAdmin.display_name(item)}
 
         html_options = options.delete(:html_options) || {}
         html_options.reverse_merge!(rel: 'popover', remote: options[:remote], data: popover_data)
@@ -120,10 +131,10 @@ module AbAdmin
 
       # input_set 'title', legend_class: 'do_sort', label_class: 'label-info' do
       def input_set(title, options={}, &block)
-        options.reverse_merge!(class: "inputs well well-small #{options.delete(:legend_class) || 'do_sort'}", id: options.delete(:legend_id))
+        options.reverse_merge!(class: "inputs well well-small clearfix #{options.delete(:legend_class) || 'do_sort'}", id: options.delete(:legend_id))
         html = content_tag(:label, title, class: "input_set label #{options.delete(:label_class)}")
         html.concat(capture(&block)) if block_given?
-        content_tag(:fieldset, html, options)
+        content_tag(:div, html, options)
       end
 
       def ha(attr)

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -13,6 +13,15 @@ module AbAdmin
         form_for([:admin, object].flatten, *(args << options), &block)
       end
 
+      def list_sort_link(attribute, options={})
+        adapter = options[:adapter] || @search
+        if adapter && adapter.klass == resource_class
+          sort_link(adapter, attribute, options)
+        else
+          attribute.is_a?(Symbol) ? ha(attribute) : attribute
+        end
+      end
+
       def sort_link(search, attribute, *args)
         name = attribute.is_a?(Symbol) ? ha(attribute) : attribute
         return name unless search
@@ -20,24 +29,25 @@ module AbAdmin
         options = args.first.is_a?(Hash) ? args.shift.dup : {}
         search_params = params[:q] || {}.with_indifferent_access
         attr_name = (options.delete(:column) || attribute).to_s
+        default_order = options.delete :default_order
 
         if existing_sort = search.sorts.detect { |s| s.name == attr_name }
           prev_attr, prev_dir = existing_sort.name, existing_sort.dir
+          current_dir = prev_attr == attr_name ? prev_dir : nil
+        else
+          current_dir = nil
         end
 
-        default_order = options.delete :default_order
-        current_dir = prev_attr == attr_name ? prev_dir : nil
-
         if current_dir
           new_dir = current_dir == 'desc' ? 'asc' : 'desc'
         else
           new_dir = default_order || 'asc'
         end
 
-        html_options = args.first.is_a?(Hash) ? args.shift.dup : {}
+        html_options = options.delete(:html_options) || {}
         html_options[:class] = ['sort_link', current_dir, html_options[:class]].compact.join(' ')
-        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"))
 
+        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"))
         link_to [name, order_indicator_for(current_dir)].join(' ').html_safe, url_for(options), html_options
       end
 
@@ -47,7 +57,7 @@ module AbAdmin
         elsif order == 'desc'
           '&#9660;'
         else
-          '<span class="order_indicator">&#9650;&#9660;</div></span>'
+          '<span class="order_indicator">&#9650;&#9660;</span>'
         end
       end
 
@@ -64,9 +74,13 @@ module AbAdmin
             item_link_to_can? :show, item, icon('info-sign', true), resource_path(item),
                               class: 'btn btn-info', title: t('admin.actions.show.link')
           when :preview
-            if path = preview_resource_path(item)
-              link_to icon('eye-open', true), path, class: 'btn btn-small btn-inverse', title: t('admin.actions.preview.link'), target: '_blank'
+            preview_path = preview_resource_path(item)
+            if preview_path
+              link_to icon('eye-open', true), preview_path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank'
             end
+          when :history
+            item_link_to_can? :history, item, icon('book', true), history_resource_path(item),
+                              class: 'btn btn-info', title: t('admin.actions.history.link')
           when AbAdmin::Config::ActionItem
             instance_exec(item, &action.data) if action.for_context?(self)
           else
@@ -90,6 +104,8 @@ module AbAdmin
             if path = preview_resource_path(resource)
               link_to t('admin.actions.preview.link'), path, class: 'btn btn-inverse', title: t('admin.actions.preview.link'), target: '_blank'
             end
+          when :history
+            link_to_can? :history, t('admin.actions.history.link'), history_resource_path, class: 'btn btn-info'
           when AbAdmin::Config::ActionItem
             instance_exec(&action.data) if action.for_context?(self)
           else
@@ -103,7 +119,7 @@ module AbAdmin
       end
 
       def item_link_to_can?(act, item, *args, &block)
-        if can?(act, get_subject)
+        if can?(act, item)
           if block_given?
             link_to(*args, &block)
           else
@@ -115,7 +131,6 @@ module AbAdmin
       def model_admin_menu_link(model)
         content_tag :li, class: ('active' if controller_name.split('/').last == model.model_name.plural) do
           link_to model.model_name.human(count: 9), "/admin/#{model.model_name.plural}"
-          #link_to model.model_name.human(count: 9), {action: :index, controller: "admin/#{model.model_name.plural}"}
         end
       end
 
@@ -143,9 +158,17 @@ module AbAdmin
       end
 
       def item_index_actions(item)
-        resource_action_items.map do |act|
+        actions = resource_action_items.map do |act|
           short_action_link(act, item)
-        end.join(' ').html_safe
+        end
+        actions << admin_comments_button(item) if settings[:comments] && settings[:comments][:list]
+        actions.join(' ').html_safe
+      end
+
+      def admin_comments_button(item)
+        title = [icon('comment', true), item.admin_comments_count_non_zero].compact.join(' ').html_safe
+        link_to title, admin_admin_comments_path(resource_type: item.class.name, resource_id: item.id), remote: true,
+                class: 'btn btn-info list_admin_comments_link'
       end
 
       def batch_action_toggle
@@ -159,7 +182,7 @@ module AbAdmin
       def batch_action_item(item)
         if settings[:batch]
           content_tag :td do
-            check_box_tag 'ids[]', item.id, false, id: "batch_action_item_#{item.id}", class: 'batch_check'
+            check_box_tag 'by_ids[]', item.id, false, id: "batch_action_item_#{item.id}", class: 'batch_check'
           end
         end
       end
@@ -175,16 +198,16 @@ module AbAdmin
         end
       end
 
-      def auto_edit_link(rec, opts = {})
-        return opts[:missing] unless rec
-        return if cannot?(:edit, rec)
-        admin_edit_link(rec, opts)
+      def auto_edit_link(record, options = {})
+        return options[:missing] unless record
+        return options[:title] || AbAdmin.display_name(record) if cannot?(:edit, record)
+        admin_edit_link(record, options)
       end
 
-      def auto_show_link(rec, opts = {})
-        return opts[:missing] unless rec
-        return if cannot?(:read, rec)
-        admin_show_link(rec, opts)
+      def auto_show_link(record, options = {})
+        return options[:missing] unless record
+        return options[:title] || AbAdmin.display_name(record) if cannot?(:read, record)
+        admin_show_link(record, options)
       end
 
       def admin_edit_link(record, options = {})

data/lib/ab_admin/views/content_only_wrapper.rb

@@ -0,0 +1,14 @@
+module AbAdmin
+  module Views
+    class ContentOnlyWrapper < ::SimpleForm::Wrappers::Many
+      include Singleton
+
+      def initialize
+      end
+
+      def render(input)
+        input.input
+      end
+    end
+  end
+end