rails_admin 0.6.8 → 0.7.0

data/app/helpers/rails_admin/application_helper.rb

@@ -35,7 +35,12 @@ module RailsAdmin
       return nil unless _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)).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')
+      link_to url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main') do
+        html = []
+        html << image_tag("#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", alt: '') if _current_user.email.present?
+        html << content_tag(:span, _current_user.email)
+        html.join.html_safe
+      end
     end
 
     def logout_path
@@ -85,7 +90,7 @@ module RailsAdmin
       end.join
 
       label = RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')
-      li_stack = %(<li class='nav-header'>#{label}</li>#{li_stack}).html_safe if li_stack.present?
+      li_stack = %(<li class='dropdown-header'>#{label}</li>#{li_stack}).html_safe if li_stack.present?
       li_stack
     end
 

data/app/helpers/rails_admin/main_helper.rb

@@ -4,15 +4,17 @@ module RailsAdmin
   module MainHelper
     def rails_admin_form_for(*args, &block)
       options = args.extract_options!.reverse_merge(builder: RailsAdmin::FormBuilder)
+      (options[:html] ||= {})[:novalidate] ||= !RailsAdmin::Config.browser_validations
+
       form_for(*(args << options), &block) << after_nested_form_callbacks
     end
 
     def get_indicator(percent)
       return '' if percent < 0          # none
-      return 'info' if percent < 34   # < 1/100 of max
+      return 'info' if percent < 34     # < 1/100 of max
       return 'success' if percent < 67  # < 1/10 of max
       return 'warning' if percent < 84  # < 1/3 of max
-      'danger'                # > 1/3 of max
+      'danger'                          # > 1/3 of max
     end
 
     def get_column_sets(properties)

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

@@ -1,7 +1,12 @@
 .container-fluid
   .navbar-header
+    %button.navbar-toggle.collapsed{ type: 'button', data: { toggle: 'collapse', target: '#secondary-navigation' } }
+      %span.sr-only= t('admin.toggle_navigation')
+      %span.icon-bar
+      %span.icon-bar
+      %span.icon-bar
     %a.navbar-brand.pjax{href: dashboard_path}
       = _get_plugin_name[0] || 'Rails'
       %small= _get_plugin_name[1] || 'Admin'
-  .collapse.navbar-collapse
+  .collapse.navbar-collapse#secondary-navigation
     = render partial: 'layouts/rails_admin/secondary_navigation'

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

@@ -5,8 +5,6 @@
     %li= link_to t('admin.home.name'), main_app_root_path
   - if _current_user
     - if user_link = edit_user_link
-      %li= user_link
+      %li.edit_user_root_link= user_link
     - if logout_path.present?
       %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/_form_file_upload.html.haml

@@ -3,11 +3,15 @@
 .toggle{style: ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
   - if value = field.pretty_value
     = value
+
   = form.file_field(field.name, field.html_attributes.reverse_merge({ data: { fileupload: true }}))
+
 - if field.optional? && field.errors.blank? && file && field.delete_method
-  %a.btn.btn-info{href: '#', :'data-toggle' => 'button', onclick: "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false"}
+  %a.btn.btn-info.btn-remove-image{href: '#', :'data-toggle' => 'button', role: 'button', onclick: "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false;"}
     %i.icon-white.icon-trash
     = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase}"
-  = form.check_box(field.delete_method, style: 'display:none;' )
+
+  = 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/index.html.haml

@@ -102,6 +102,8 @@
           %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")
+          %button#remove_filter.btn.btn-info{title: "Reset filters"}
+            %i.icon-white.icon-remove  
       - if export_action
         %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
 

data/config/locales/rails_admin.en.yml

@@ -16,7 +16,10 @@ en:
       is_exactly: Is exactly
       starts_with: Starts with
       ends_with: Ends with
+      too_many_objects: "Too many objects, use search box above"
+      no_objects: "No objects found"
     loading: "Loading..."
+    toggle_navigation: Toggle navigation
     home:
       name: "Home"
     pagination:

data/lib/rails_admin/config.rb

@@ -50,6 +50,9 @@ module RailsAdmin
       # hide blank fields in show view if true
       attr_accessor :compact_show_view
 
+      # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+      attr_accessor :browser_validations
+
       # Set the max width of columns in list view before a new set is created
       attr_accessor :total_columns_width
 
@@ -254,6 +257,7 @@ module RailsAdmin
       # @see RailsAdmin::Config.registry
       def reset
         @compact_show_view = true
+        @browser_validations = true
         @yell_for_non_accessible_fields = true
         @authenticate = nil
         @authorize = nil

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

@@ -21,7 +21,7 @@ module RailsAdmin
             am = amc.abstract_model
             wording = associated.send(amc.object_label_method)
             can_see = !am.embedded? && (show_action = v.action(:show, am, associated))
-            can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id), class: 'pjax') : wording
+            can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id), class: 'pjax') : ERB::Util.html_escape(wording)
           end.to_sentence.html_safe
         end
 

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

@@ -124,7 +124,9 @@ module RailsAdmin
         end
 
         register_instance_option :html_attributes do
-          {}
+          {
+            required: required?,
+          }
         end
 
         register_instance_option :default_value do

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

@@ -1,5 +1,6 @@
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/enum'
+require 'rails_admin/config/fields/types/active_record_enum'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   model = parent.abstract_model.model
@@ -11,6 +12,9 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
          model.method_defined?(method_name))
     fields << RailsAdmin::Config::Fields::Types::Enum.new(parent, properties.name, properties)
     true
+  elsif model.respond_to?(:defined_enums) && model.defined_enums[properties.name.to_s]
+    fields << RailsAdmin::Config::Fields::Types::ActiveRecordEnum.new(parent, properties.name, properties)
+    true
   else
     false
   end

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

@@ -0,0 +1,41 @@
+require 'rails_admin/config/fields/types/enum'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class ActiveRecordEnum < Enum
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          def type
+            :enum
+          end
+
+          register_instance_option :enum do
+            abstract_model.model.defined_enums[name.to_s]
+          end
+
+          register_instance_option :pretty_value do
+            bindings[:object].send(name).presence || ' - '
+          end
+
+          register_instance_option :multiple? do
+            false
+          end
+
+          register_instance_option :queryable do
+            false
+          end
+
+          def parse_input(params)
+            if params[name].present?
+              params[name] = enum.invert[params[name].to_i]
+            elsif params[name]
+              params[name] = nil
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+require 'rails_admin/config/fields/types/active_record_enum'
 require 'rails_admin/config/fields/types/belongs_to_association'
 require 'rails_admin/config/fields/types/boolean'
 require 'rails_admin/config/fields/types/bson_object_id'

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

@@ -33,7 +33,8 @@ 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)
+                image_html = v.image_tag(thumb_url, class: 'img-thumbnail')
+                url != thumb_url ? v.link_to(image_html, url, target: '_blank') : image_html
               else
                 v.link_to(nil, url, target: '_blank')
               end
@@ -48,6 +49,12 @@ module RailsAdmin
             [method_name, delete_method, cache_method].compact
           end
 
+          register_instance_option :html_attributes do
+            {
+              required: required? && !value.present?,
+            }
+          end
+
           # virtual class
           def resource_url
             fail('not implemented')

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

@@ -14,7 +14,7 @@ module RailsAdmin
 
           def parse_input(params)
             return unless params[name].is_a?(::String)
-            params[name] = (params[name].blank? ? nil : (YAML.safe_load(params[name]) || nil))
+            params[name] = (params[name].blank? ? nil : (SafeYAML.load(params[name]) || nil))
           end
         end
       end

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

@@ -7,10 +7,15 @@ module RailsAdmin
         class String < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types.register(self)
 
+          def input_size
+            [50, length.to_i].reject(&:zero?).min
+          end
+
           register_instance_option :html_attributes do
             {
+              required: required?,
               maxlength: length,
-              size: [50, length.to_i].min,
+              size: input_size,
             }
           end
 

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

@@ -28,6 +28,7 @@ module RailsAdmin
 
           register_instance_option :html_attributes do
             {
+              required: required?,
               cols: '48',
               rows: '3',
             }

data/lib/rails_admin/engine.rb

@@ -7,10 +7,7 @@ require 'rack-pjax'
 require 'rails'
 require 'rails_admin'
 require 'remotipart'
-require 'safe_yaml'
-
-SafeYAML::OPTIONS[:suppress_warnings] = true
-SafeYAML::OPTIONS[:default_mode] = :unsafe
+require 'safe_yaml/load'
 
 module RailsAdmin
   class Engine < Rails::Engine

data/lib/rails_admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -505,6 +505,7 @@ files:
 - lib/rails_admin/config/fields/factories/password.rb
 - lib/rails_admin/config/fields/group.rb
 - lib/rails_admin/config/fields/types.rb
+- lib/rails_admin/config/fields/types/active_record_enum.rb
 - lib/rails_admin/config/fields/types/all.rb
 - lib/rails_admin/config/fields/types/belongs_to_association.rb
 - lib/rails_admin/config/fields/types/boolean.rb
@@ -593,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Admin for Rails