rails_admin 2.0.0.beta → 2.0.0.rc

data/app/assets/javascripts/rails_admin/ui.js

@@ -0,0 +1,135 @@
+(function($) {
+  $(document).on("click", "#list input.toggle", function() {
+    $("#list [name='bulk_ids[]']").prop("checked", $(this).is(":checked"));
+  });
+
+  $(document).on('click', '.pjax', function(event) {
+    if (event.which > 1 || event.metaKey || event.ctrlKey) {
+        return;
+    }
+
+    if ($.support.pjax) {
+      event.preventDefault();
+      $.pjax({
+        container: $(this).data('pjax-container') || '[data-pjax-container]',
+        url: $(this).data('href') || $(this).attr('href'),
+        timeout: 2000
+      });
+      return;
+    }
+
+    if ($(this).data('href')) {
+      window.location = $(this).data('href');
+    }
+  });
+
+  $(document).on('submit', '.pjax-form', function(event) {
+    if ($.support.pjax) {
+      event.preventDefault();
+      $.pjax({
+        container: $(this).data('pjax-container') || '[data-pjax-container]',
+        url: this.action + (this.action.indexOf('?') !== -1 ? '&' : '?') + $(this).serialize(),
+        timeout: 2000
+      });
+    }
+  });
+
+  $(document).on('pjax:start', function() {
+    return $('#loading').show();
+  }).on('pjax:end', function() {
+    return $('#loading').hide();
+  });
+
+  $(document).on('click', '[data-target]', function() {
+    if (!$(this).hasClass('disabled')) {
+      if ($(this).has('i.icon-chevron-down').length) {
+        $(this).removeClass('active').children('i').toggleClass('icon-chevron-down icon-chevron-right');
+        $($(this).data('target')).select(':visible').hide('slow');
+      } else {
+        if ($(this).has('i.icon-chevron-right').length) {
+          $(this).addClass('active').children('i').toggleClass('icon-chevron-down icon-chevron-right');
+          $($(this).data('target')).select(':hidden').show('slow');
+        }
+      }
+    }
+  });
+
+  $(document).on('click', '.form-horizontal legend', function() {
+    if ($(this).has('i.icon-chevron-down').length) {
+      $(this).siblings('.control-group:visible').hide('slow');
+      $(this).children('i').toggleClass('icon-chevron-down icon-chevron-right');
+    } else {
+      if ($(this).has('i.icon-chevron-right').length) {
+        $(this).siblings('.control-group:hidden').show('slow');
+        $(this).children('i').toggleClass('icon-chevron-down icon-chevron-right');
+      }
+    }
+  });
+
+  $(document).on('click', 'form .tab-content .tab-pane a.remove_nested_one_fields', function() {
+    $(this).children('input[type="hidden"]').val($(this).hasClass('active')).siblings('i').toggleClass('icon-check icon-trash');
+  });
+
+  $(document).ready(function() {
+    RailsAdmin.I18n.init($('html').attr('lang'), $("#admin-js").data('i18nOptions'));
+    $(document).trigger('rails_admin.dom_ready');
+  });
+
+  $(document).on('pjax:end', function() {
+    $(document).trigger('rails_admin.dom_ready');
+  });
+
+  $(document).on('rails_admin.dom_ready', function() {
+    $('.nav.nav-pills li.active').removeClass('active');
+    $(".nav.nav-pills li[data-model=\"" + ($('.page-header').data('model')) + "\"]").addClass('active');
+    $('.animate-width-to').each(function() {
+      var length, width;
+      length = $(this).data("animate-length");
+      width = $(this).data("animate-width-to");
+      $(this).animate({
+        width: width
+      }, length, 'easeOutQuad');
+    });
+    $('.form-horizontal legend').has('i.icon-chevron-right').each(function() {
+      $(this).siblings('.control-group').hide();
+    });
+    $(".table").tooltip({
+      selector: "th[rel=tooltip]"
+    });
+    $('[formnovalidate]').on('click', function() {
+      $(this).closest('form').attr('novalidate', true);
+    });
+    $.each($('#filters_box').data('options'), function() {
+      $.filters.append(this);
+    });
+  });
+
+  $(document).on('click', ".bulk-link", function(event) {
+    event.preventDefault();
+    $('#bulk_action').val($(this).data('action'));
+    $('#bulk_form').submit();
+  });
+
+  $(document).on('click', "#remove_filter", function(event) {
+    event.preventDefault();
+    $("#filters_box").html("");
+    $("hr.filters_box").hide();
+    $(this).parent().siblings("input[type='search']").val("");
+    $(this).parents("form").submit();
+  });
+
+  $(document).on('click', '#fields_to_export label input#check_all', function() {
+    var elems;
+    elems = $('#fields_to_export label input');
+    if ($('#fields_to_export label input#check_all').is(':checked')) {
+      $(elems).prop('checked', true);
+    } else {
+      $(elems).prop('checked', false);
+    }
+  });
+
+  $(document).on('click', '#fields_to_export .reverse-selection', function() {
+    $(this).closest(".control-group").find(".controls").find("input").click();
+  });
+
+}(jQuery));

data/app/assets/stylesheets/rails_admin/ra.widgets.scss

@@ -11,3 +11,7 @@ iframe.wysihtml5-sandbox, .wysihtml5-editor{
   max-height: 200px;
   max-width: 300px;
 }
+
+.controls.ui-sortable .sortables{
+  cursor: move;
+}

data/app/helpers/rails_admin/application_helper.rb

@@ -84,9 +84,24 @@ module RailsAdmin
       end.join.html_safe
     end
 
+    def root_navigation
+      actions(:root).select(&:show_in_sidebar).group_by(&:sidebar_label).collect do |label, nodes|
+        li_stack = nodes.map do |node|
+          url = rails_admin.url_for(action: node.action_name, controller: "rails_admin/main")
+          nav_icon = node.link_icon ? %(<i class="#{node.link_icon}"></i>).html_safe : ''
+          content_tag :li do
+            link_to nav_icon + " " + wording_for(:menu, node), url, class: "pjax"
+          end
+        end.join.html_safe
+        label ||= t('admin.misc.root_navigation')
+
+        %(<li class='dropdown-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
+      end.join.html_safe
+    end
+
     def static_navigation
       li_stack = RailsAdmin::Config.navigation_static_links.collect do |title, url|
-        content_tag(:li, link_to(title.to_s, url, target: '_blank'))
+        content_tag(:li, link_to(title.to_s, url, target: '_blank', rel: 'noopener noreferrer'))
       end.join
 
       label = RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')
@@ -138,7 +153,7 @@ module RailsAdmin
 
     # parent => :root, :collection, :member
     def menu_for(parent, abstract_model = nil, object = nil, only_icon = false) # perf matters here (no action view trickery)
-      actions = actions(parent, abstract_model, object).select { |a| a.http_methods.include?(:get) }
+      actions = actions(parent, abstract_model, object).select { |a| a.http_methods.include?(:get) && a.show_in_menu }
       actions.collect do |action|
         wording = wording_for(:menu, action)
         %(

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

@@ -0,0 +1,7 @@
+%meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
+%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
+%meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
+%meta{content: "NONE,NOARCHIVE", name: "robots"}
+= csrf_meta_tag
+= stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
+= javascript_include_tag "rails_admin/rails_admin.js"

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

@@ -1,5 +1,5 @@
 %ul.nav.navbar-nav.navbar-right.root_links
-  - actions(:root).each do |action|
+  - actions(:root).select(&:show_in_navigation).each do |action|
     %li{class: "#{action.action_name}_root_link"}= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: action.pjax? ? "pjax" : ""
   - if main_app_root_path = (main_app.root_path rescue false)
     %li= link_to t('admin.home.name'), main_app_root_path

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

@@ -1,2 +1,3 @@
 %ul.nav.nav-pills.nav-stacked= main_navigation
-%ul.nav.nav-pills.nav-stacked= static_navigation
+%ul.nav.nav-pills.nav-stacked= root_navigation
+%ul.nav.nav-pills.nav-stacked= static_navigation

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

@@ -1,13 +1,7 @@
 !!! 5
 %html{lang: I18n.locale}
   %head
-    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
-    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-    %meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
-    %meta{content: "NONE,NOARCHIVE", name: "robots"}
-    = csrf_meta_tag
-    = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
-    = javascript_include_tag "rails_admin/rails_admin.js"
+    = render "layouts/rails_admin/head"
   %body.rails_admin
     #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
@@ -18,4 +12,5 @@
         .col-sm-3.col-md-2.sidebar-nav
           = render "layouts/rails_admin/sidebar_navigation"
         .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
-          .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
+          .content{:'data-pjax-container' => true}
+            = render template: 'layouts/rails_admin/pjax'

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

@@ -1,5 +1,8 @@
 - file = field.value
 
+- if field.cache_method
+  = form.hidden_field(field.cache_method, value: field.cache_value)
+
 .toggle{style: ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
   - if value = field.pretty_value
     = value
@@ -12,6 +15,3 @@
     = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase}"
 
   = form.check_box(field.delete_method, style: 'display:none;')
-
-- if field.cache_method
-  = form.hidden_field(field.cache_method)

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

@@ -1,12 +1,14 @@
 - field.attachments.each_with_index do |attachment, i|
-  .toggle
+  .toggle{class: field.reorderable? ? 'sortables' : ''}
     = attachment.pretty_value
-    - if field.delete_method
+    - if field.delete_method || field.keep_method
       %a.btn.btn-info.btn-remove-image{href: '#', :'data-toggle' => 'button', role: 'button'}
         %i.icon-white.icon-trash
         = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase} ##{i + 1}"
-
-    = form.check_box(field.delete_method, {multiple:true, style: 'display:none;'}, attachment.delete_key, nil)
+      - if field.keep_method
+        = form.check_box(field.keep_method, {multiple:true, checked: true, style: 'display:none;'}, attachment.keep_value, nil)
+      - elsif field.delete_method
+        = form.check_box(field.delete_method, {multiple:true, style: 'display:none;'}, attachment.delete_value, nil)
 
 = form.file_field(field.name, field.html_attributes.reverse_merge({ data: { :"multiple-fileupload" => true }, multiple: true }))
 

data/config/locales/rails_admin.en.yml

@@ -41,6 +41,7 @@ en:
       up: "Up"
       down: "Down"
       navigation: "Navigation"
+      root_navigation: "Actions"
       navigation_static_label: "Links"
       log_out: "Log out"
       time_ago: "%{time} ago"

data/lib/generators/rails_admin/templates/initializer.erb

@@ -8,8 +8,8 @@ RailsAdmin.config do |config|
   # end
   # config.current_user_method(&:current_user)
 
-  ## == Cancan ==
-  # config.authorize_with :cancan
+  ## == CancanCan ==
+  # config.authorize_with :cancancan
 
   ## == Pundit ==
   # config.authorize_with :pundit

data/lib/rails_admin.rb

@@ -2,7 +2,6 @@ require 'rails_admin/engine'
 require 'rails_admin/abstract_model'
 require 'rails_admin/config'
 require 'rails_admin/extension'
-require 'rails_admin/extensions/cancan'
 require 'rails_admin/extensions/cancancan'
 require 'rails_admin/extensions/pundit'
 require 'rails_admin/extensions/paper_trail'

data/lib/rails_admin/abstract_model.rb

@@ -46,7 +46,7 @@ module RailsAdmin
     def initialize(model_or_model_name)
       @model_name = model_or_model_name.to_s
       ancestors = model.ancestors.collect(&:to_s)
-      if ancestors.include?('ActiveRecord::Base') && !model.abstract_class?
+      if ancestors.include?('ActiveRecord::Base') && !model.abstract_class? && model.table_exists?
         initialize_active_record
       elsif ancestors.include?('Mongoid::Document')
         initialize_mongoid

data/lib/rails_admin/adapters/active_record.rb

@@ -64,6 +64,10 @@ module RailsAdmin
         end
       end
 
+      def base_class
+        model.base_class
+      end
+
       delegate :primary_key, :table_name, to: :model, prefix: false
 
       def encoding
@@ -101,7 +105,7 @@ module RailsAdmin
 
         def add(field, value, operator)
           field.searchable_columns.flatten.each do |column_infos|
-            statement, value1, value2 = StatementBuilder.new(column_infos[:column], column_infos[:type], value, operator).to_statement
+            statement, value1, value2 = StatementBuilder.new(column_infos[:column], column_infos[:type], value, operator, @scope.connection.adapter_name).to_statement
             @statements << statement if statement.present?
             @values << value1 unless value1.nil?
             @values << value2 unless value2.nil?
@@ -149,10 +153,15 @@ module RailsAdmin
       end
 
       def build_statement(column, type, value, operator)
-        StatementBuilder.new(column, type, value, operator).to_statement
+        StatementBuilder.new(column, type, value, operator, model.connection.adapter_name).to_statement
       end
 
       class StatementBuilder < RailsAdmin::AbstractModel::StatementBuilder
+        def initialize(column, type, value, operator, adapter_name)
+          super column, type, value, operator
+          @adapter_name = adapter_name
+        end
+
       protected
 
         def unary_operators
@@ -265,7 +274,7 @@ module RailsAdmin
         end
 
         def ar_adapter
-          ::ActiveRecord::Base.connection.adapter_name.downcase
+          @adapter_name.downcase
         end
       end
     end

data/lib/rails_admin/adapters/mongoid.rb

@@ -49,6 +49,14 @@ module RailsAdmin
         end
         scope = sort_by(options, scope) if options[:sort]
         scope
+      rescue NoMethodError => e
+        if e.message =~ /page/
+          e = e.exception <<-EOM.gsub(/^\s{12}/, '')
+            #{e.message}
+            If you don't have kaminari-mongoid installed, add `gem 'kaminari-mongoid'` to your Gemfile.
+          EOM
+        end
+        raise e
       end
 
       def count(options = {}, scope = nil)
@@ -74,6 +82,12 @@ module RailsAdmin
         fields.collect { |_name, field| Property.new(field, model) }
       end
 
+      def base_class
+        klass = model
+        klass = klass.superclass while klass.hereditary?
+        klass
+      end
+
       def table_name
         model.collection_name.to_s
       end

data/lib/rails_admin/bootstrap-sass.rb

@@ -11,7 +11,7 @@ module RailsAdmin
         require 'rails_admin/bootstrap-sass/sass_functions'
       end
 
-      require 'sass-rails' if rails?
+      require 'sassc-rails' if rails?
 
       unless rails? || compass?
         raise(Bootstrap::FrameworkNotFound.new('bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded'))

data/lib/rails_admin/config.rb

@@ -141,11 +141,11 @@ module RailsAdmin
       #   end
       #
       # To use an authorization adapter, pass the name of the adapter. For example,
-      # to use with CanCan[https://github.com/ryanb/cancan], pass it like this.
+      # to use with CanCanCan[https://github.com/CanCanCommunity/cancancan/], pass it like this.
       #
-      # @example CanCan
+      # @example CanCanCan
       #   RailsAdmin.config do |config|
-      #     config.authorize_with :cancan
+      #     config.authorize_with :cancancan
       #   end
       #
       # See the wiki[https://github.com/sferik/rails_admin/wiki] for more on authorization.
@@ -210,9 +210,7 @@ module RailsAdmin
 
       # pool of all found model names from the whole application
       def models_pool
-        excluded = (excluded_models.collect(&:to_s) + %w(RailsAdmin::History PaperTrail::Version PaperTrail::VersionAssociation ActiveStorage::Attachment ActiveStorage::Blob))
-
-        (viable_models - excluded).uniq.sort
+        (viable_models - excluded_models.collect(&:to_s)).uniq.sort
       end
 
       # Loads a model configuration instance from the registry or registers

data/lib/rails_admin/config/actions/base.rb

@@ -18,6 +18,22 @@ module RailsAdmin
           []
         end
 
+        register_instance_option :show_in_navigation do
+          root?
+        end
+
+        register_instance_option :show_in_sidebar do
+          !show_in_navigation
+        end
+
+        register_instance_option :show_in_menu do
+          true
+        end
+
+        register_instance_option :sidebar_label do
+          nil
+        end
+
         # http://getbootstrap.com/2.3.2/base-css.html#icons
         register_instance_option :link_icon do
           'icon-question-sign'
@@ -83,7 +99,7 @@ module RailsAdmin
           key.to_sym
         end
 
-        # For Cancan and the like
+        # For CanCanCan and the like
         register_instance_option :authorization_key do
           key.to_sym
         end

data/lib/rails_admin/config/actions/edit.rb

@@ -25,9 +25,7 @@ module RailsAdmin
               sanitize_params_for!(request.xhr? ? :modal : :update)
 
               @object.set_attributes(params[@abstract_model.param_key])
-              @authorization_adapter && @authorization_adapter.attributes_for(:update, @abstract_model).each do |name, value|
-                @object.send("#{name}=", value)
-              end
+              @authorization_adapter && @authorization_adapter.authorize(:update, @abstract_model, @object)
               changes = @object.changes
               if @object.save
                 @auditing_adapter && @auditing_adapter.update_object(@object, @abstract_model, _current_user, changes)