rails_admin 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f6b0bf2715b8343ec12147a678f6af4342fd60
-  data.tar.gz: 06c11b7753f662ea8aee4d5b0c7a41fc4f61902f
+  metadata.gz: 6e83f0b5ab7fea00e279ccb63773df754a184035
+  data.tar.gz: 03a9fae5679bf0d672d117ffd972e70a78428cb8
 SHA512:
-  metadata.gz: 5088678be8b3b6e30e545fbbfcdc9331a725341d8c002eb2067c181b349ad5a2a34e7d45d6b7257310858f0e6b35888759a354e8c4581546cbe822a9f6a96892
-  data.tar.gz: 28e6549d5c45bae55ad63564ca5ff4ed81dc9bc25df53b253cb64d783f10d43da61f69bea76acb004725f9e7abf6695fdbe405404f207a49a0ffda863478e58d
+  metadata.gz: 4a25b6d1b31de086846abc6069af7190770fe71f2a8ce127282267776ace5206462abbfbddd1b12e839d224548fa8c12c6c4a1e2b9d7c1f7b8def9736146e6b3
+  data.tar.gz: f01215ec461ec23ea67a46455c610caa40c8c35168b160454a1c33c2534800126533c509bc7bfd8d2c9c2401923a679efa51ab046200b10ca83f41fac93c2608

data/Gemfile

@@ -1,16 +1,17 @@
 source 'https://rubygems.org'
 
 case ENV['RAILS_VERSION']
-when '4.2'
-  gem 'rails', '~> 4.2.0.beta1'
-  gem 'sass-rails', '~> 5.0.0.beta1'
-  gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2'
 when '4.0'
   gem 'rails', '~> 4.0.0'
   gem 'devise', '>= 3.2'
-else
+  gem 'test-unit'
+when '4.1'
   gem 'rails', '~> 4.1.0'
   gem 'devise', '>= 3.2'
+else
+  gem 'rails', '~> 4.2.0'
+  gem 'sass-rails', '~> 5.0'
+  gem 'devise', '>= 3.4'
 end
 
 case ENV['CI_ORM']
@@ -57,7 +58,7 @@ group :test do
   gem 'capybara', '>= 2.1'
   gem 'carrierwave', '>= 0.8'
   gem 'coveralls'
-  gem 'database_cleaner', '>= 1.2'
+  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0']
   gem 'dragonfly', '~> 1.0'
   gem 'factory_girl', '>= 4.2'
   gem 'generator_spec', '>= 0.8'

data/README.md

@@ -89,7 +89,8 @@ This library aims to support and is [tested against][travis] the following Ruby
 
 * Ruby 1.9.3
 * Ruby 2.0.0
-* Ruby 2.1.1
+* Ruby 2.1
+* Ruby 2.2
 * [Rubinius][]
 * [JRuby][]
 

data/app/assets/stylesheets/rails_admin/base/font-awesome-4-compability.scss

@@ -1,153 +1,153 @@
 [class^="icon-"],
 [class*=" icon-"] {
-  @extend .fa
+  @extend .fa !optional;
 }
 
-.icon-glass              { @extend .fa-glass; }
-.icon-music              { @extend .fa-music; }
-.icon-search             { @extend .fa-search; }
-.icon-envelope           { @extend .fa-envelope; }
-.icon-heart              { @extend .fa-heart; }
-.icon-star               { @extend .fa-star; }
-.icon-star-empty         { @extend .fa-star-o; }
-.icon-user               { @extend .fa-user; }
-.icon-film               { @extend .fa-film; }
-.icon-th-large           { @extend .fa-th-large; }
-.icon-th                 { @extend .fa-th; }
-.icon-th-list            { @extend .fa-th-list; }
-.icon-ok                 { @extend .fa-check; }
-.icon-remove             { @extend .fa-times; }
-.icon-zoom-in            { @extend .fa-search-plus; }
-.icon-zoom-out           { @extend .fa-search-minus; }
-.icon-off                { @extend .fa-power-off; }
-.icon-signal             { @extend .fa-signal; }
-.icon-cog                { @extend .fa-cog; }
-.icon-trash              { @extend .fa-trash-o; }
+.icon-glass              { @extend .fa-glass !optional; }
+.icon-music              { @extend .fa-music !optional; }
+.icon-search             { @extend .fa-search !optional; }
+.icon-envelope           { @extend .fa-envelope !optional; }
+.icon-heart              { @extend .fa-heart !optional; }
+.icon-star               { @extend .fa-star !optional; }
+.icon-star-empty         { @extend .fa-star-o !optional; }
+.icon-user               { @extend .fa-user !optional; }
+.icon-film               { @extend .fa-film !optional; }
+.icon-th-large           { @extend .fa-th-large !optional; }
+.icon-th                 { @extend .fa-th !optional; }
+.icon-th-list            { @extend .fa-th-list !optional; }
+.icon-ok                 { @extend .fa-check !optional; }
+.icon-remove             { @extend .fa-times !optional; }
+.icon-zoom-in            { @extend .fa-search-plus !optional; }
+.icon-zoom-out           { @extend .fa-search-minus !optional; }
+.icon-off                { @extend .fa-power-off !optional; }
+.icon-signal             { @extend .fa-signal !optional; }
+.icon-cog                { @extend .fa-cog !optional; }
+.icon-trash              { @extend .fa-trash-o !optional; }
 
-.icon-home               { @extend .fa-home; }
-.icon-file               { @extend .fa-file; }
-.icon-time               { @extend .fa-clock-o; }
-.icon-road               { @extend .fa-road; }
-.icon-download-alt       { @extend .fa-download; }
-.icon-download           { @extend .fa-download; }
-.icon-upload             { @extend .fa-upload; }
-.icon-inbox              { @extend .fa-inbox; }
-.icon-play-circle        { @extend .fa-play-circle; }
-.icon-repeat             { @extend .fa-repeat; }
-.icon-refresh            { @extend .fa-refresh; }
-.icon-list-alt           { @extend .fa-list-alt; }
-.icon-lock               { @extend .fa-lock; }
-.icon-flag               { @extend .fa-flag; }
-.icon-headphones         { @extend .fa-headphones; }
-.icon-volume-off         { @extend .fa-volume-off; }
-.icon-volume-down        { @extend .fa-volume-down; }
-.icon-volume-up          { @extend .fa-volume-up; }
-.icon-qrcode             { @extend .fa-qrcode; }
-.icon-barcode            { @extend .fa-barcode; }
+.icon-home               { @extend .fa-home !optional; }
+.icon-file               { @extend .fa-file !optional; }
+.icon-time               { @extend .fa-clock-o !optional; }
+.icon-road               { @extend .fa-road !optional; }
+.icon-download-alt       { @extend .fa-download !optional; }
+.icon-download           { @extend .fa-download !optional; }
+.icon-upload             { @extend .fa-upload !optional; }
+.icon-inbox              { @extend .fa-inbox !optional; }
+.icon-play-circle        { @extend .fa-play-circle !optional; }
+.icon-repeat             { @extend .fa-repeat !optional; }
+.icon-refresh            { @extend .fa-refresh !optional; }
+.icon-list-alt           { @extend .fa-list-alt !optional; }
+.icon-lock               { @extend .fa-lock !optional; }
+.icon-flag               { @extend .fa-flag !optional; }
+.icon-headphones         { @extend .fa-headphones !optional; }
+.icon-volume-off         { @extend .fa-volume-off !optional; }
+.icon-volume-down        { @extend .fa-volume-down !optional; }
+.icon-volume-up          { @extend .fa-volume-up !optional; }
+.icon-qrcode             { @extend .fa-qrcode !optional; }
+.icon-barcode            { @extend .fa-barcode !optional; }
 
-.icon-tag                { @extend .fa-tag; }
-.icon-tags               { @extend .fa-tags; }
-.icon-book               { @extend .fa-book; }
-.icon-bookmark           { @extend .fa-bookmark; }
-.icon-print              { @extend .fa-print; }
-.icon-camera             { @extend .fa-camera; }
-.icon-font               { @extend .fa-font; }
-.icon-bold               { @extend .fa-bold; }
-.icon-italic             { @extend .fa-italic; }
-.icon-text-height        { @extend .fa-text-height; }
-.icon-text-width         { @extend .fa-text-width; }
-.icon-align-left         { @extend .fa-align-left; }
-.icon-align-center       { @extend .fa-align-center; }
-.icon-align-right        { @extend .fa-align-right; }
-.icon-align-justify      { @extend .fa-align-justify; }
-.icon-list               { @extend .fa-list; }
-.icon-indent-left        { @extend .fa-indent; }
-.icon-indent-right       { @extend .fa-dedent; }
-.icon-facetime-video     { @extend .fa-video-camera; }
-.icon-picture            { @extend .fa-picture-o; }
+.icon-tag                { @extend .fa-tag !optional; }
+.icon-tags               { @extend .fa-tags !optional; }
+.icon-book               { @extend .fa-book !optional; }
+.icon-bookmark           { @extend .fa-bookmark !optional; }
+.icon-print              { @extend .fa-print !optional; }
+.icon-camera             { @extend .fa-camera !optional; }
+.icon-font               { @extend .fa-font !optional; }
+.icon-bold               { @extend .fa-bold !optional; }
+.icon-italic             { @extend .fa-italic !optional; }
+.icon-text-height        { @extend .fa-text-height !optional; }
+.icon-text-width         { @extend .fa-text-width !optional; }
+.icon-align-left         { @extend .fa-align-left !optional; }
+.icon-align-center       { @extend .fa-align-center !optional; }
+.icon-align-right        { @extend .fa-align-right !optional; }
+.icon-align-justify      { @extend .fa-align-justify !optional; }
+.icon-list               { @extend .fa-list !optional; }
+.icon-indent-left        { @extend .fa-indent !optional; }
+.icon-indent-right       { @extend .fa-dedent !optional; }
+.icon-facetime-video     { @extend .fa-video-camera !optional; }
+.icon-picture            { @extend .fa-picture-o !optional; }
 
-.icon-pencil             { @extend .fa-pencil; }
-.icon-map-marker         { @extend .fa-map-marker; }
-.icon-adjust             { @extend .fa-adjust; }
-.icon-tint               { @extend .fa-tint; }
-.icon-edit               { @extend .fa-edit; }
-.icon-share              { @extend .fa-share-square-o; }
-.icon-check              { @extend .fa-check; }
-.icon-move               { @extend .fa-arrows; }
-.icon-step-backward      { @extend .fa-step-backward; }
-.icon-fast-backward      { @extend .fa-fast-backward; }
-.icon-backward           { @extend .fa-backward; }
-.icon-play               { @extend .fa-play; }
-.icon-pause              { @extend .fa-pause; }
-.icon-stop               { @extend .fa-stop; }
-.icon-forward            { @extend .fa-forward; }
-.icon-fast-forward       { @extend .fa-fast-forward; }
-.icon-step-forward       { @extend .fa-step-forward; }
-.icon-eject              { @extend .fa-eject; }
-.icon-chevron-left       { @extend .fa-chevron-left; }
-.icon-chevron-right      { @extend .fa-chevron-right; }
+.icon-pencil             { @extend .fa-pencil !optional; }
+.icon-map-marker         { @extend .fa-map-marker !optional; }
+.icon-adjust             { @extend .fa-adjust !optional; }
+.icon-tint               { @extend .fa-tint !optional; }
+.icon-edit               { @extend .fa-edit !optional; }
+.icon-share              { @extend .fa-share-square-o !optional; }
+.icon-check              { @extend .fa-check !optional; }
+.icon-move               { @extend .fa-arrows !optional; }
+.icon-step-backward      { @extend .fa-step-backward !optional; }
+.icon-fast-backward      { @extend .fa-fast-backward !optional; }
+.icon-backward           { @extend .fa-backward !optional; }
+.icon-play               { @extend .fa-play !optional; }
+.icon-pause              { @extend .fa-pause !optional; }
+.icon-stop               { @extend .fa-stop !optional; }
+.icon-forward            { @extend .fa-forward !optional; }
+.icon-fast-forward       { @extend .fa-fast-forward !optional; }
+.icon-step-forward       { @extend .fa-step-forward !optional; }
+.icon-eject              { @extend .fa-eject !optional; }
+.icon-chevron-left       { @extend .fa-chevron-left !optional; }
+.icon-chevron-right      { @extend .fa-chevron-right !optional; }
 
-.icon-plus-sign          { @extend .fa-plus-circle; }
-.icon-minus-sign         { @extend .fa-minus-circle; }
-.icon-remove-sign        { @extend .fa-times-circle; }
-.icon-ok-sign            { @extend .fa-check-circle; }
-.icon-question-sign      { @extend .fa-question-circle; }
-.icon-info-sign          { @extend .fa-info-circle; }
-.icon-screenshot         { @extend .fa-crosshairs; }
-.icon-remove-circle      { @extend .fa-times-circle-o; }
-.icon-ok-circle          { @extend .fa-check-circle-o; }
-.icon-ban-circle         { @extend .fa-ban; }
-.icon-arrow-left         { @extend .fa-arrow-left; }
-.icon-arrow-right        { @extend .fa-arrow-right; }
-.icon-arrow-up           { @extend .fa-arrow-up; }
-.icon-arrow-down         { @extend .fa-arrow-down; }
-.icon-share-alt          { @extend .fa-share; }
-.icon-resize-full        { @extend .fa-expand; }
-.icon-resize-small       { @extend .fa-compress; }
-.icon-plus               { @extend .fa-plus; }
-.icon-minus              { @extend .fa-minus; }
-.icon-asterisk           { @extend .fa-asterisk; }
+.icon-plus-sign          { @extend .fa-plus-circle !optional; }
+.icon-minus-sign         { @extend .fa-minus-circle !optional; }
+.icon-remove-sign        { @extend .fa-times-circle !optional; }
+.icon-ok-sign            { @extend .fa-check-circle !optional; }
+.icon-question-sign      { @extend .fa-question-circle !optional; }
+.icon-info-sign          { @extend .fa-info-circle !optional; }
+.icon-screenshot         { @extend .fa-crosshairs !optional; }
+.icon-remove-circle      { @extend .fa-times-circle-o !optional; }
+.icon-ok-circle          { @extend .fa-check-circle-o !optional; }
+.icon-ban-circle         { @extend .fa-ban !optional; }
+.icon-arrow-left         { @extend .fa-arrow-left !optional; }
+.icon-arrow-right        { @extend .fa-arrow-right !optional; }
+.icon-arrow-up           { @extend .fa-arrow-up !optional; }
+.icon-arrow-down         { @extend .fa-arrow-down !optional; }
+.icon-share-alt          { @extend .fa-share !optional; }
+.icon-resize-full        { @extend .fa-expand !optional; }
+.icon-resize-small       { @extend .fa-compress !optional; }
+.icon-plus               { @extend .fa-plus !optional; }
+.icon-minus              { @extend .fa-minus !optional; }
+.icon-asterisk           { @extend .fa-asterisk !optional; }
 
-.icon-exclamation-sign   { @extend .fa-exclamation-circle; }
-.icon-gift               { @extend .fa-gift; }
-.icon-leaf               { @extend .fa-leaf; }
-.icon-fire               { @extend .fa-fire; }
-.icon-eye-open           { @extend .fa-eye; }
-.icon-eye-close          { @extend .fa-eye-slash; }
-.icon-warning-sign       { @extend .fa-warning; }
-.icon-plane              { @extend .fa-plane; }
-.icon-calendar           { @extend .fa-calendar; }
-.icon-random             { @extend .fa-random; }
-.icon-comment            { @extend .fa-comment; }
-.icon-magnet             { @extend .fa-magnet; }
-.icon-chevron-up         { @extend .fa-chevron-up; }
-.icon-chevron-down       { @extend .fa-chevron-down; }
-.icon-retweet            { @extend .fa-retweet; }
-.icon-shopping-cart      { @extend .fa-shopping-cart; }
-.icon-folder-close       { @extend .fa-folder; }
-.icon-folder-open        { @extend .fa-folder-open; }
-.icon-resize-vertical    { @extend .fa-arrows-v; }
-.icon-resize-horizontal  { @extend .fa-arrows-h; }
+.icon-exclamation-sign   { @extend .fa-exclamation-circle !optional; }
+.icon-gift               { @extend .fa-gift !optional; }
+.icon-leaf               { @extend .fa-leaf !optional; }
+.icon-fire               { @extend .fa-fire !optional; }
+.icon-eye-open           { @extend .fa-eye !optional; }
+.icon-eye-close          { @extend .fa-eye-slash !optional; }
+.icon-warning-sign       { @extend .fa-warning !optional; }
+.icon-plane              { @extend .fa-plane !optional; }
+.icon-calendar           { @extend .fa-calendar !optional; }
+.icon-random             { @extend .fa-random !optional; }
+.icon-comment            { @extend .fa-comment !optional; }
+.icon-magnet             { @extend .fa-magnet !optional; }
+.icon-chevron-up         { @extend .fa-chevron-up !optional; }
+.icon-chevron-down       { @extend .fa-chevron-down !optional; }
+.icon-retweet            { @extend .fa-retweet !optional; }
+.icon-shopping-cart      { @extend .fa-shopping-cart !optional; }
+.icon-folder-close       { @extend .fa-folder !optional; }
+.icon-folder-open        { @extend .fa-folder-open !optional; }
+.icon-resize-vertical    { @extend .fa-arrows-v !optional; }
+.icon-resize-horizontal  { @extend .fa-arrows-h !optional; }
 
-.icon-hdd                { @extend .fa-hdd-o; }
-.icon-bullhorn           { @extend .fa-bullhorn; }
-.icon-bell               { @extend .fa-bell; }
-.icon-certificate        { @extend .fa-certificate; }
-.icon-thumbs-up          { @extend .fa-thumbs-up; }
-.icon-thumbs-down        { @extend .fa-thumbs-down; }
-.icon-hand-right         { @extend .fa-hand-o-right; }
-.icon-hand-left          { @extend .fa-hand-o-left; }
-.icon-hand-up            { @extend .fa-hand-o-up; }
-.icon-hand-down          { @extend .fa-hand-o-down; }
-.icon-circle-arrow-right { @extend .fa-arrow-circle-right; }
-.icon-circle-arrow-left  { @extend .fa-arrow-circle-left; }
-.icon-circle-arrow-up    { @extend .fa-arrow-circle-up; }
-.icon-circle-arrow-down  { @extend .fa-arrow-circle-down; }
-.icon-globe              { @extend .fa-globe; }
-.icon-wrench             { @extend .fa-wrench; }
-.icon-tasks              { @extend .fa-tasks; }
-.icon-filter             { @extend .fa-filter; }
-.icon-briefcase          { @extend .fa-briefcase; }
-.icon-fullscreen         { @extend .fa-arrows-alt; }
+.icon-hdd                { @extend .fa-hdd-o !optional; }
+.icon-bullhorn           { @extend .fa-bullhorn !optional; }
+.icon-bell               { @extend .fa-bell !optional; }
+.icon-certificate        { @extend .fa-certificate !optional; }
+.icon-thumbs-up          { @extend .fa-thumbs-up !optional; }
+.icon-thumbs-down        { @extend .fa-thumbs-down !optional; }
+.icon-hand-right         { @extend .fa-hand-o-right !optional; }
+.icon-hand-left          { @extend .fa-hand-o-left !optional; }
+.icon-hand-up            { @extend .fa-hand-o-up !optional; }
+.icon-hand-down          { @extend .fa-hand-o-down !optional; }
+.icon-circle-arrow-right { @extend .fa-arrow-circle-right !optional; }
+.icon-circle-arrow-left  { @extend .fa-arrow-circle-left !optional; }
+.icon-circle-arrow-up    { @extend .fa-arrow-circle-up !optional; }
+.icon-circle-arrow-down  { @extend .fa-arrow-circle-down !optional; }
+.icon-globe              { @extend .fa-globe !optional; }
+.icon-wrench             { @extend .fa-wrench !optional; }
+.icon-tasks              { @extend .fa-tasks !optional; }
+.icon-filter             { @extend .fa-filter !optional; }
+.icon-briefcase          { @extend .fa-briefcase !optional; }
+.icon-fullscreen         { @extend .fa-arrows-alt !optional; }
 
-.icon-white              { color:white; }
+.icon-white              { color:white; }

data/app/assets/stylesheets/rails_admin/base/theming.scss

@@ -33,6 +33,7 @@ body.rails_admin {
     top: 50px;
     bottom: 0;
     background: #eaf0f1;
+    z-index: 100;
   }
 
   /* fat labels in forms */
@@ -116,8 +117,6 @@ body.rails_admin {
       fieldset {
         margin-left:-10px;
         .control-group > label {
-          padding-left:10px;
-          width:135px;
         }
         legend {
           float:left;
@@ -133,8 +132,6 @@ body.rails_admin {
       fieldset {
         margin-left:-20px;
         .control-group > label {
-          padding-left:20px;
-          width:125px;
         }
         legend {
           margin-left:20px;
@@ -181,7 +178,7 @@ body.rails_admin {
   // }
 
   /* nested nav */
-  .nav.nav-list {
+  .nav {
     .nav-level-1 {
       padding-left:30px;
     }
@@ -269,7 +266,7 @@ body.rails_admin {
     /* icons */
     td.links {
       max-width: none;
-      .inline {
+      .list-inline {
         margin:0px;
         li { display:inline-block; }
       }

data/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss

@@ -6,7 +6,7 @@
 .ui-datepicker {
   /* fix glitches */
   border-width:0px;
-  z-index: 3!important;
+  z-index: 1051!important;
   table{
     margin:0px;
   }

data/app/controllers/rails_admin/application_controller.rb

@@ -7,6 +7,9 @@ module RailsAdmin
   class ObjectNotFound < ::StandardError
   end
 
+  class ActionNotAllowed < ::StandardError
+  end
+
   class ApplicationController < ::ApplicationController
     newrelic_ignore if defined?(NewRelic)
 
@@ -16,7 +19,7 @@ module RailsAdmin
 
     helper_method :_current_user, :_get_plugin_name
 
-    attr_reader :object, :model_config, :abstract_model
+    attr_reader :object, :model_config, :abstract_model, :authorization_adapter
 
     def get_model
       @model_name = to_model_name(params[:model_name])
@@ -68,13 +71,5 @@ module RailsAdmin
       params[:action] = 'dashboard'
       dashboard
     end
-
-    def not_found
-      render file: Rails.root.join('public', '404.html'), layout: false, status: :not_found
-    end
-
-    def rails_admin_controller?
-      true
-    end
   end
 end

data/app/controllers/rails_admin/main_controller.rb

@@ -11,16 +11,17 @@ module RailsAdmin
     before_filter :check_for_cancel
 
     RailsAdmin::Config::Actions.all.each do |action|
-      class_eval %{
+      class_eval <<-EOS, __FILE__, __LINE__ + 1
         def #{action.action_name}
           action = RailsAdmin::Config::Actions.find('#{action.action_name}'.to_sym)
           @authorization_adapter.try(:authorize, action.authorization_key, @abstract_model, @object)
           @action = action.with({controller: self, abstract_model: @abstract_model, object: @object})
+          fail(ActionNotAllowed) unless @action.enabled?
           @page_name = wording_for(:title)
 
           instance_eval &@action.controller
         end
-      }
+      EOS
     end
 
     def bulk_action

data/app/helpers/rails_admin/application_helper.rb

@@ -12,9 +12,9 @@ module RailsAdmin
       wording
     end
 
-    def authorized?(action, abstract_model = nil, object = nil)
+    def authorized?(action_name, abstract_model = nil, object = nil)
       object = nil if object.try :new_record?
-      @authorization_adapter.nil? || @authorization_adapter.authorized?(action, abstract_model, object)
+      action(action_name, abstract_model, object).try(:authorized?)
     end
 
     def current_action?(action, abstract_model = @abstract_model, object = @object)
@@ -32,9 +32,8 @@ module RailsAdmin
     end
 
     def edit_user_link
-      return nil unless authorized?(:edit, _current_user.class, _current_user) && _current_user.respond_to?(:email)
       return nil unless abstract_model = RailsAdmin.config(_current_user.class).abstract_model
-      return nil unless edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)
+      return nil unless (edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)).try(:authorized?)
       link_to _current_user.email, url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main')
     end
 

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

@@ -2,11 +2,11 @@
   - actions(:root).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: "pjax"
   - if main_app_root_path = (main_app.root_path rescue false)
-    %li= link_to t('admin.home.name').capitalize, main_app_root_path
+    %li= link_to t('admin.home.name'), main_app_root_path
   - if _current_user
     - if user_link = edit_user_link
       %li= user_link
     - if logout_path.present?
-      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-important'), logout_path, method: logout_method
+      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-danger'), logout_path, method: logout_method
     - if _current_user.respond_to?(:email) && _current_user.email.present?
       %li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", style: 'padding-top:5px'

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

@@ -1,7 +1,7 @@
 - object = delete_notice
 
 %li{style: 'display:block; margin-top:10px'}
-  %span.label= @abstract_model.pretty_name
+  %span.label.label-default= @abstract_model.pretty_name
   - wording = object.send(@model_config.object_label_method)
   - if show_action = action(:show, @abstract_model, object)
     = link_to(wording, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: object.id), class: 'pjax')

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

@@ -1 +1 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), class: 'form-control'})
+= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), class: 'form-control', required: field.required})

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

@@ -1,4 +1,4 @@
-.controls{data: { nestedmany: true }}
+.controls.col-md-offset-2{data: { nestedmany: true }}
   .btn-group
     %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content, #{form.jquery_namespace(field)} > .controls > .nav", class: (field.active? ? 'active' : '')}
       %i.icon-white

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

@@ -1 +1 @@
-= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value, class: 'form-control' })
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value, class: 'form-control', required: field.required })

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

@@ -1,16 +1,18 @@
 %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
 %br
-.form-actions
-  %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
-    %i.icon-white.icon-ok
-    = t("admin.form.save")
-  %span.extra_buttons
-    - if authorized? :new, @abstract_model
-      %button.btn.btn-info{type: "submit", name: "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
-        = t("admin.form.save_and_add_another")
-    - if authorized? :edit, @abstract_model
-      %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
-        = t("admin.form.save_and_edit")
-    %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
-      %i.icon-remove
-      = t("admin.form.cancel")
+
+.form-group.form-actions
+  .col-sm-offset-2.col-sm-10
+    %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
+      %i.icon-white.icon-ok
+      = t("admin.form.save")
+    %span.extra_buttons
+      - if authorized? :new, @abstract_model
+        %button.btn.btn-info{type: "submit", name: "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
+          = t("admin.form.save_and_add_another")
+      - if authorized? :edit, @abstract_model
+        %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
+          = t("admin.form.save_and_edit")
+      %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
+        %i.icon-remove
+        = t("admin.form.cancel")

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

@@ -27,8 +27,8 @@
                 .progress-bar.animate-width-to{:class => "progress-bar-#{get_indicator(percent)}", :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
                   = @count[abstract_model.pretty_name]
             %td.links
-              %ul.inline= menu_for :collection, abstract_model, nil, true
-- if @auditing_adapter && authorized?(:history)
+              %ul.inline.list-inline= menu_for :collection, abstract_model, nil, true
+- if @auditing_adapter && authorized?(:history_index)
   #block-tables.block
     .content
       %h2= t("admin.actions.history_index.menu")

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

@@ -8,13 +8,13 @@
     %legend
       %i.icon-chevron-down
       = t('admin.export.select')
-    .control-group
+    .form-group.control-group
       .controls
         .col-sm-2
         %label.col-sm-10.checkbox{for: 'check_all'}
           = check_box_tag 'all', 'all', true, { id: 'check_all' }
           = t('admin.export.select_all_fields')
-    .control-group
+    .form-group.control-group
       %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
       .col-sm-10.controls
         - visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field|
@@ -34,7 +34,7 @@
 
     - visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field|
       - fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
-      .control-group
+      .form-group.control-group
         %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', name: field.label.downcase)
         .col-sm-10.controls
           - fields.each do |associated_model_field|
@@ -47,7 +47,7 @@
     %legend
       %i.icon-chevron-down
       = t('admin.export.options_for', name: 'csv')
-    .control-group
+    .form-group.control-group
       - guessed_encoding = @abstract_model.encoding
       %label.col-sm-2.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
       .col-sm-10.controls
@@ -55,14 +55,14 @@
         = select_tag 'csv_options[encoding_to]', options_for_select(RailsAdmin::CSVConverter::TARGET_ENCODINGS), include_blank: true
         %p.help-block= t('admin.export.csv.encoding_to_help', name: guessed_encoding)
 
-    .control-group
+    .form-group.control-group
       %label.col-sm-2.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
       .col-sm-10.controls
         %label.checkbox
           = check_box_tag 'csv_options[skip_header]', 'true'
         %p.help-block= t('admin.export.csv.skip_header_help')
 
-    .control-group
+    .form-group.control-group
       %label.col-sm-2.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
       .col-sm-10.controls
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })

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

@@ -7,10 +7,12 @@
 
 = form_tag("", method: "get", class: "search pjax-form form-inline") do
   .well
-    %input{name: "query", type: "search", value: query, placeholder: "#{t("admin.misc.filter")}", class: 'input-small'}
-    %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
-      %i.icon-white.icon-refresh
-      = t("admin.misc.refresh")
+    .input-group
+      %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: "#{t("admin.misc.filter")}", class: 'input-small'}
+      %span.input-group-btn
+        %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+          %i.icon-white.icon-refresh
+          = t("admin.misc.refresh")
 %table#history.table.table-striped.table-condensed
   %thead
     %tr

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

@@ -145,7 +145,7 @@
             - if @other_right_link ||= other_right && index_path(params.merge(set: (params[:set].to_i + 1)))
               %td.other.right= link_to "...", @other_right_link, class: 'pjax'
             %td.last.links
-              %ul.inline= menu_for :member, @abstract_model, object, true
+              %ul.inline.list-inline= menu_for :member, @abstract_model, object, true
     - if @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
       .row

data/lib/rails_admin/adapters/active_record/property.rb

@@ -18,7 +18,7 @@ module RailsAdmin
         end
 
         def type
-          if model.serialized_attributes[property.name.to_s]
+          if serialized?
             :serialized
           else
             property.type
@@ -44,6 +44,16 @@ module RailsAdmin
         def read_only?
           false
         end
+
+      private
+
+        def serialized?
+          if Rails.version < '4.2'
+            model.serialized_attributes[property.name.to_s]
+          else
+            model.type_for_attribute(property.name).class == ::ActiveRecord::Type::Serialized
+          end
+        end
       end
     end
   end

data/lib/rails_admin/config.rb

@@ -320,7 +320,7 @@ module RailsAdmin
       def visible_models_with_bindings(bindings)
         models.collect { |m| m.with(bindings) }.select do |m|
           m.visible? &&
-            bindings[:controller].authorized?(:index, m.abstract_model) &&
+            RailsAdmin::Config::Actions.find(:index, bindings.merge(abstract_model: m.abstract_model)).try(:authorized?) &&
             (!m.abstract_model.embedded? || m.abstract_model.cyclic?)
         end
       end

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

@@ -28,15 +28,18 @@ module RailsAdmin
           authorized?
         end
 
+        register_instance_option :enabled? do
+          bindings[:abstract_model].nil? || (
+            (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
+            ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
+            bindings[:abstract_model].config.with(bindings).visible?
+          )
+        end
+
         register_instance_option :authorized? do
-          (
-            bindings[:controller].nil? || bindings[:controller].authorized?(authorization_key, bindings[:abstract_model], bindings[:object])
-          ) && (
-            bindings[:abstract_model].nil? || (
-              (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
-              ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
-              bindings[:abstract_model].config.with(bindings).visible?
-          ))
+          enabled? && (
+            bindings[:controller].try(:authorization_adapter).nil? || bindings[:controller].authorization_adapter.authorized?(authorization_key, bindings[:abstract_model], bindings[:object])
+          )
         end
 
         # Is the action acting on the root level (Example: /admin/contact)

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

@@ -172,7 +172,7 @@ module RailsAdmin
           end
           (@required ||= {})[context] ||= !!([name] + children_fields).uniq.detect do |column_name| # rubocop:disable DoubleNegation
             abstract_model.model.validators_on(column_name).detect do |v|
-              !v.options[:allow_nil] &&
+              !(v.options[:allow_nil] || v.options[:allow_blank]) &&
               [:presence, :numericality, :attachment_presence].include?(v.kind) &&
               (v.options[:on] == context || v.options[:on].blank?)
             end

data/lib/rails_admin/config/fields/group.rb

@@ -63,7 +63,7 @@ module RailsAdmin
 
         # Configurable group label which by default is group's name humanized.
         register_instance_option :label do
-          (@label ||= {})[::I18n.locale] ||= (parent.fields.detect { |f|f.name == name }.try(:label) || name.to_s.humanize)
+          (@label ||= {})[::I18n.locale] ||= (parent.fields.detect { |f| f.name == name }.try(:label) || name.to_s.humanize)
         end
 
         # Configurable help text

data/lib/rails_admin/config/fields/types/boolean.rb

@@ -13,11 +13,11 @@ module RailsAdmin
           register_instance_option :pretty_value do
             case value
             when nil
-              %(<span class='badge'>-</span>)
+              %(<span class='label label-default'>&#x2012;</span>)
             when false
-              %(<span class='badge badge-important'>&#x2718;</span>)
+              %(<span class='label label-danger'>&#x2718;</span>)
             when true
-              %(<span class='badge badge-success'>&#x2713;</span>)
+              %(<span class='label label-success'>&#x2713;</span>)
             end.html_safe
           end
 

data/lib/rails_admin/config/fields/types/enum.rb

@@ -23,7 +23,7 @@ module RailsAdmin
             if enum.is_a?(::Hash)
               enum.reject { |_k, v| v.to_s != value.to_s }.keys.first.to_s.presence || value.presence || ' - '
             elsif enum.is_a?(::Array) && enum.first.is_a?(::Array)
-              enum.detect { |e|e[1].to_s == value.to_s }.try(:first).to_s.presence || value.presence || ' - '
+              enum.detect { |e| e[1].to_s == value.to_s }.try(:first).to_s.presence || value.presence || ' - '
             else
               value.presence || ' - '
             end

data/lib/rails_admin/config/fields/types/file_upload.rb

@@ -33,9 +33,9 @@ module RailsAdmin
               url = resource_url
               if image
                 thumb_url = resource_url(thumb_method)
-                url != thumb_url ? v.link_to(v.image_tag(thumb_url, class: 'img-polaroid'), url, target: 'blank') : v.image_tag(thumb_url)
+                url != thumb_url ? v.link_to(v.image_tag(thumb_url, class: 'img-polaroid'), url, target: '_blank') : v.image_tag(thumb_url)
               else
-                v.link_to(nil, url, target: 'blank')
+                v.link_to(nil, url, target: '_blank')
               end
             end
           end

data/lib/rails_admin/config/fields/types/json.rb

@@ -7,6 +7,7 @@ module RailsAdmin
         class Json < RailsAdmin::Config::Fields::Types::Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
+          RailsAdmin::Config::Fields::Types.register(:jsonb, self)
 
           register_instance_option :formatted_value do
             value.present? ? JSON.pretty_generate(value) : nil

data/lib/rails_admin/engine.rb

@@ -15,6 +15,9 @@ SafeYAML::OPTIONS[:default_mode] = :unsafe
 module RailsAdmin
   class Engine < Rails::Engine
     isolate_namespace RailsAdmin
+
+    config.action_dispatch.rescue_responses.merge!('RailsAdmin::ActionNotAllowed' => :forbidden)
+
     initializer 'RailsAdmin precompile hook', group: :all do |app|
       app.config.assets.precompile += %w(
         rails_admin/rails_admin.js

data/lib/rails_admin/extensions/history/history.rb

@@ -16,12 +16,10 @@ module RailsAdmin
       end
 
       def create_history_item(message, object, abstract_model, user)
-        create(
-           message: [message].flatten.join(', '),
-           item: object.id,
-           table: abstract_model.to_s,
-           username: user.try(:email),
-         )
+        create(message: [message].flatten.join(', '),
+               item: object.id,
+               table: abstract_model.to_s,
+               username: user.try(:email))
       end
 
       def history_for_model(abstract_model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))

data/lib/rails_admin/version.rb

@@ -2,7 +2,7 @@ module RailsAdmin
   class Version
     MAJOR = 0
     MINOR = 6
-    PATCH = 6
+    PATCH = 7
     PRE = nil
 
     class << self

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Erik Michaels-Ober
 - Bogdan Gaza
 - Petteri Kaapa
 - Benoit Benezech
+- Mitsuhiro Shibuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -587,7 +588,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Admin for Rails