rails_admin 0.0.5 → 0.1.0

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

@@ -21,6 +21,7 @@
         .span3
           .well.sidebar-nav
             %ul.nav.nav-list= main_navigation
+            %ul.nav.nav-list= static_navigation
         .span9
           .row-fluid
-            .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/_delete_notice.html.haml

@@ -1,18 +1,19 @@
 - object = delete_notice
-- show_enabled = RailsAdmin::Config::Actions.all.map(&:key).include?(:show)
 
 %li{:style => 'display:block; margin-top:10px'}
   %span.label= @abstract_model.pretty_name
-  - if show_enabled
-    = link_to @model_config.with(:object => object).object_label, show_path(:model_name => @abstract_model.to_param, :id => object.id)
+  - 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')
   - else
-    = @model_config.with(:object => object).object_label
+    = wording
   %ul
     - @abstract_model.each_associated_children(object) do |association, child|
       %li
         - child_config = RailsAdmin.config(child)
-        = association[:pretty_name]
-        - if show_enabled
-          = link_to(child_config.with(:object => child).object_label, show_path(:model_name => child_config.abstract_model.to_param, :id => child.id))
+        = @abstract_model.model.human_attribute_name association[:name]
+        - wording = child.send(child_config.object_label_method)
+        - if child.id && (show_action = action(:show, child_config.abstract_model, child))
+          = link_to(wording, url_for(:action => show_action.action_name, :model_name => child_config.abstract_model.to_param, :id => child.id), :class => 'pjax')
         - else
-          = child_config.with(:object => child).object_label
+          = wording

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

@@ -1 +1 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ :data => { :datetimepicker => true, :options => field.js_plugin_options.to_json } }).reverse_merge((hdv = field.html_default_value).nil? ? {} : { :value => hdv })
+= form.send field.view_helper, field.method_name, field.html_attributes.merge({:value => (field.value.present? ? field.value : field.html_default_value)}).reverse_merge({ :data => { :datetimepicker => true, :options => field.js_plugin_options.to_json } })

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

@@ -1 +1,18 @@
-= form.select field.method_name, field.enum, { :include_blank => true }.reverse_merge((hdv = field.html_default_value).nil? ? {} : { :selected => hdv }), field.html_attributes.reverse_merge({ :data => { :enumeration => true }, :placeholder => t('admin.misc.search') })
+- unless field.multiple?
+  = form.select field.method_name, field.enum, { :include_blank => true }.reverse_merge((hdv = field.html_default_value).nil? ? {} : { :selected => hdv }), field.html_attributes.reverse_merge({ :data => { :enumeration => true }, :placeholder => t('admin.misc.search') })
+- else
+  :ruby
+    js_data = {
+      :xhr => false,
+      :sortable => false,
+      :cacheAll => true,
+      :regional => {
+        :chooseAll => t("admin.misc.chose_all"),
+        :chosen    => t("admin.misc.chosen", :name => config.label_plural),
+        :clearAll  => t("admin.misc.clear_all"),
+        :search    => t("admin.misc.search"),
+        :up        => t("admin.misc.up"),
+        :down      => t("admin.misc.down")
+      }
+    }
+  = form.select field.method_name, field.enum, { :selected => field.value, :object => form.object }, field.html_attributes.reverse_merge({:data => { :filteringmultiselect => true, :options => js_data.to_json }, :multiple => true})

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

@@ -3,11 +3,11 @@
 .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 } }))
+  = 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"}
     %i.icon-white.icon-trash
-    = I18n.t('admin.actions.delete.menu').capitalize + " #{field.method_name}"
+    = 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_text.html.haml

@@ -4,7 +4,7 @@
     js_data = {
       :jspath => field.ckeditor_location ? field.ckeditor_location : field.ckeditor_base_location + "ckeditor.js",
       :base_location => field.ckeditor_base_location,
-      :options => { 
+      :options => {
         :customConfig => field.ckeditor_config_js ? field.ckeditor_config_js : field.ckeditor_base_location + "config.js"
       }
     }
@@ -16,6 +16,12 @@
       :options => field.codemirror_config,
       :locations => field.codemirror_assets
     }
+  elsif field.bootstrap_wysihtml5
+    richtext = 'bootstrap-wysihtml5'
+    js_data = {
+      :csspath => field.bootstrap_wysihtml5_css_location,
+      :jspath => field.bootstrap_wysihtml5_js_location
+    }
   else
     richtext = false
     js_data = {}

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

@@ -1,29 +1,30 @@
-%table.table.table-condensed.table-striped
-  %thead
-    %tr
-      %th.shrink.model-name= t "admin.table_headers.model_name"
-      %th.shrink.last-used= t "admin.table_headers.last_used"
-      %th.records= t "admin.table_headers.records"
-      %th.shrink.controls
-  %tbody
-    - @abstract_models.each do |abstract_model|
-      - if authorized? :index, abstract_model
-        - index_path = index_path(:model_name => abstract_model.to_param)
-        - row_class = "#{cycle("odd", "even")}#{" link" if index_path}"
+- if @abstract_models
+  %table.table.table-condensed.table-striped
+    %thead
+      %tr
+        %th.shrink.model-name= t "admin.table_headers.model_name"
+        %th.shrink.last-used= t "admin.table_headers.last_used"
+        %th.records= t "admin.table_headers.records"
+        %th.shrink.controls
+    %tbody
+      - @abstract_models.each do |abstract_model|
+        - if authorized? :index, abstract_model
+          - index_path = index_path(:model_name => abstract_model.to_param)
+          - row_class = "#{cycle("odd", "even")}#{" link" if index_path}"
 
-        %tr{:class => row_class, :"data-link" => index_path}
-          %td
-            %span.show= link_to abstract_model.config.label_plural, index_path, :class => 'pjax'
-          %td
-            - if (last_used = @most_recent_changes[abstract_model.pretty_name])
-              = time_ago_in_words last_used
-              = t "admin.misc.ago"
-          %td
-            - count = @count[abstract_model.pretty_name]
-            - percent = count > 0 ? (@max < 2.0 ? count : ((Math.log(count) * 100.0) / Math.log(@max))) : -1
-            .label.animate-width-to{:class => 'label-'+get_indicator(percent), :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent - 1].max.to_i}%", :style => "width:2%"}= @count[abstract_model.pretty_name]
-          %td.links
-            %ul.inline= menu_for :collection, abstract_model, nil, true
+          %tr{:class => row_class, :"data-link" => index_path}
+            %td
+              %span.show= link_to abstract_model.config.label_plural, index_path, :class => 'pjax'
+            %td
+              - if (last_used = @most_recent_changes[abstract_model.pretty_name])
+                = time_ago_in_words last_used
+                = t "admin.misc.ago"
+            %td
+              - count = @count[abstract_model.pretty_name]
+              - percent = count > 0 ? (@max < 2.0 ? count : ((Math.log(count) * 100.0) / Math.log(@max))) : -1
+              .label.animate-width-to{:class => 'label-'+get_indicator(percent), :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent - 1].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)
   #block-tables.block
     .content

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

@@ -113,7 +113,7 @@
             - if property.sortable
               - sort_location = index_path params.except('sort_reverse').except('page').merge(:sort => property.name).merge(selected && sort_reverse != "true" ? {:sort_reverse => "true"} : {})
               - sort_direction = selected ? (sort_reverse == 'true' ? "headerSortUp" : "headerSortDown") : nil
-            %th{:class => "#{property.sortable && "header pjax" || nil} #{property.sortable && sort_direction ? sort_direction : nil} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location)}= property.label
+            %th{:class => "#{property.sortable && "header pjax" || nil} #{property.sortable && sort_direction ? sort_direction : nil} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location), :rel => "tooltip", :title => "#{property.hint}"}= property.label
           - if other_right
             %th.other.right.shrink= "..."
           %th.last.shrink

data/config/initializers/active_record_extensions.rb

@@ -1,7 +1,7 @@
 if defined?(::ActiveRecord)
   class ActiveRecord::Base
     def self.rails_admin(&block)
-      RailsAdmin::Config.model(self, &block)
+      RailsAdmin.config(self, &block)
     end
 
     def rails_admin_default_object_label_method
@@ -9,7 +9,7 @@ if defined?(::ActiveRecord)
     end
 
     def safe_send(value)
-      if self.attributes.find{ |k,v| k.to_s == value.to_s }
+      if self.has_attribute?(value)
         self.read_attribute(value)
       else
         self.send(value)

data/config/locales/rails_admin.en.yml

@@ -22,6 +22,7 @@ en:
       up: "Up"
       down: "Down"
       navigation: "Navigation"
+      navigation_static_label: "Links"
       log_out: "Log out"
       ago: "ago"
     flash:

data/lib/generators/rails_admin/install_generator.rb

@@ -43,7 +43,7 @@ module RailsAdmin
         generate "devise", model_name
       else
         display "And you already set it up, good! We just need to know about your user model name..."
-        guess = routes.match(/devise_for :(\w+)/)[1].try(:singularize)
+        guess = routes.match(/devise_for +:(\w+)/)[1].try(:singularize)
         display("We found '#{guess}' (should be one of 'user', 'admin', etc.)")
         model_name = ask_for("Correct Devise model name if needed.", guess, _model_name)
         unless guess == model_name

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

@@ -3,99 +3,98 @@
 
 RailsAdmin.config do |config|
 
-  # If your default_local is different from :en, uncomment the following 2 lines and set your default locale here:
-  # require 'i18n'
-  # I18n.default_locale = :de
 
+  ################  Global configuration  ################
+
+  # Set the admin name here (optional second array element will appear in red). For example:
+  config.main_app_name = ['<%= Rails.application.engine_name.titleize.chomp(' Application') %>', 'Admin']
+  # or for a more dynamic name:
+  # config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.titleize, controller.params['action'].titleize] }
+
+  # RailsAdmin may need a way to know who the current user is]
   config.current_user_method { current_<%= @model_name.underscore %> } # auto-generated
 
   # If you want to track changes on your models:
-  # config.audit_with :history, <%= @model_name.classify %>
+  # config.audit_with :history, '<%= @model_name.classify %>'
 
   # Or with a PaperTrail: (you need to install it first)
-  # config.audit_with :paper_trail, <%= @model_name.classify %>
-
-  # Set the admin name here (optional second array element will appear in a beautiful RailsAdmin red ©)
-  config.main_app_name = ['<%= Rails.application.engine_name.titleize.chomp(' Application') %>', 'Admin']
-  # or for a dynamic name:
-  # config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.titleize, controller.params['action'].titleize] }
-
+  # config.audit_with :paper_trail, '<%= @model_name.classify %>'
 
-  #  ==> Global show view settings
-  # Display empty fields in show views
+  # Display empty fields in show views:
   # config.compact_show_view = false
 
-  #  ==> Global list view settings
   # Number of default rows per-page:
   # config.default_items_per_page = 20
 
-  #  ==> Included models
-  # Add all excluded models here:
-  # config.excluded_models = [<%= RailsAdmin::AbstractModel.all.map{|am| am.model.to_s }.join(', ') %>]
+  # Exclude specific models (keep the others):
+  # config.excluded_models = [<%= RailsAdmin::AbstractModel.all.map{|am| "'#{am.model}'" }.join(', ') %>]
 
-  # Add models here if you want to go 'whitelist mode':
-  # config.included_models = [<%= RailsAdmin::AbstractModel.all.map{|am| am.model.to_s }.join(', ') %>]
+  # Include specific models (exclude the others):
+  # config.included_models = [<%= RailsAdmin::AbstractModel.all.map{|am| "'#{am.model}'" }.join(', ') %>]
 
-  # Application wide tried label methods for models' instances
+  # Label methods for model instances:
   # config.label_methods << :description # Default is [:name, :title]
 
-  #  ==> Global models configuration
-  # config.models do
-  #   # Configuration here will affect all included models in all scopes, handle with care!
-  #
-  #   list do
-  #     # Configuration here will affect all included models in list sections (same for show, export, edit, update, create)
-  #
-  #     fields_of_type :date do
-  #       # Configuration here will affect all date fields, in the list section, for all included models. See README for a comprehensive type list.
-  #     end
-  #   end
-  # end
-  #
-  #  ==> Model specific configuration
-  # Keep in mind that *all* configuration blocks are optional.
-  # RailsAdmin will try his best to provide the best defaults for each section, for each field.
-  # Try to override as few things as possible, in the most generic way. Try to avoid setting labels for models and attributes, use ActiveRecord I18n API instead.
-  # Less code is better code!
-  # config.model MyModel do
-  #   # Cross-section field configuration
-  #   object_label_method :name     # Name of the method called for pretty printing an *instance* of ModelName
-  #   label 'My model'              # Name of ModelName (smartly defaults to ActiveRecord's I18n API)
-  #   label_plural 'My models'      # Same, plural
-  #   weight -1                     # Navigation priority. Bigger is higher.
-  #   parent OtherModel             # Set parent model for navigation. MyModel will be nested below. OtherModel will be on first position of the dropdown
-  #   navigation_label              # Sets dropdown entry's name in navigation. Only for parents!
-  #   # Section specific configuration:
-  #   list do
-  #     filters [:id, :name]  # Array of field names which filters should be shown by default in the table header
-  #     items_per_page 100    # Override default_items_per_page
-  #     sort_by :id           # Sort column (default is primary key)
-  #     sort_reverse true     # Sort direction (default is true for primary key, last created first)
-  #     # Here goes the fields configuration for the list view
-  #   end
-  # end
 
-  # Your model's configuration, to help you get started:
+  ################  Model configuration  ################
 
-  # All fields marked as 'hidden' won't be shown anywhere in the rails_admin unless you mark them as visible. (visible(true))
+  # Each model configuration can alternatively:
+  #   - stay here in a `config.model 'ModelName' do ... end` block
+  #   - go in the model definition file in a `rails_admin do ... end` block
+  
+  # This is your choice to make:
+  #   - This initializer is loaded once at startup (modifications will show up when restarting the application) but all RailsAdmin configuration would stay in one place.
+  #   - Models are reloaded at each request in development mode (when modified), which may smooth your RailsAdmin development workflow.
+
+
+  # Now you probably need to tour the wiki a bit: https://github.com/sferik/rails_admin/wiki
+  # Anyway, here is how RailsAdmin saw your application's models when you ran the initializer:
 
 <% RailsAdmin::AbstractModel.all.map do |abstract_model| -%>
-  # config.model <%= abstract_model.model.model_name %> do
+
+
+  ###  <%= abstract_model.model.model_name %>  ###
+
+  # config.model '<%= abstract_model.model.model_name %>' do
+
+  #   # You can copy this to a 'rails_admin do ... end' block inside your <%= abstract_model.model.model_name.underscore %>.rb model definition
+  
   #   # Found associations:
+
 <%= abstract_model.config.export.fields.select{|f| f.association?}.map do |field|
 %{  #     configure #{field.name.inspect}, #{field.type.inspect}#{"         # Hidden" unless field.visible?} }
-end.join("\n") -%>
+end.join("\n") %>
+
   #   # Found columns:
+
 <%= abstract_model.config.export.fields.select{|f| !f.association?}.map do |field|
 %{  #     configure #{field.name.inspect}, #{field.type.inspect}#{"         # Hidden" unless field.visible?} }
-end.join("\n") -%>
-  #   # Sections:
-  #   list do; end
-  #   export do; end
-  #   show do; end
-  #   edit do; end
-  #   create do; end
-  #   update do; end
+end.join("\n") %>
+
+  #   # Cross-section configuration:
+  
+  #     # object_label_method :name     # Name of the method called for pretty printing an *instance* of ModelName
+  #     # label 'My model'              # Name of ModelName (smartly defaults to ActiveRecord's I18n API)
+  #     # label_plural 'My models'      # Same, plural
+  #     # weight 0                      # Navigation priority. Bigger is higher.
+  #     # parent OtherModel             # Set parent model for navigation. MyModel will be nested below. OtherModel will be on first position of the dropdown
+  #     # navigation_label              # Sets dropdown entry's name in navigation. Only for parents!
+  
+  #   # Section specific configuration:
+  
+  #     list do
+  #       # filters [:id, :name]  # Array of field names which filters should be shown by default in the table header
+  #       # items_per_page 100    # Override default_items_per_page
+  #       # sort_by :id           # Sort column (default is primary key)
+  #       # sort_reverse true     # Sort direction (default is true for primary key, last created first)
+  #     end
+  #     show do; end
+  #     edit do; end
+  #     export do; end
+  #     # also see the create, update, modal and nested sections, which override edit in specific cases (resp. when creating, updating, modifying from another model in a popup modal or modifying from another model nested form)
+  #     # you can override a cross-section field configuration in any section with the same syntax `configure :field_name do ... end`
+  #     # using `field` instead of `configure` will exclude all other fields and force the ordering
   # end
 <%- end -%>
+
 end

data/lib/rails_admin/abstract_model.rb

@@ -40,14 +40,14 @@ module RailsAdmin
       end
     end
 
-    def initialize(m)
-      @model_name = m.to_s
-      if m.ancestors.map(&:to_s).include?('ActiveRecord::Base') && !m.abstract_class?
+    def initialize(model_or_model_name)
+      @model_name = model_or_model_name.to_s
+      if model.ancestors.map(&:to_s).include?('ActiveRecord::Base') && !model.abstract_class?
         # ActiveRecord
         @adapter = :active_record
         require 'rails_admin/adapters/active_record'
         extend Adapters::ActiveRecord
-      elsif m.ancestors.map(&:to_s).include?('Mongoid::Document')
+      elsif model.ancestors.map(&:to_s).include?('Mongoid::Document')
         # Mongoid
         @adapter = :mongoid
         require 'rails_admin/adapters/mongoid'
@@ -57,7 +57,7 @@ module RailsAdmin
 
     # do not store a reference to the model, does not play well with ActiveReload/Rails3.2
     def model
-      @model_name.try :constantize
+      @model_name.constantize
     end
 
     def config
@@ -65,11 +65,11 @@ module RailsAdmin
     end
 
     def to_param
-      model.to_s.split("::").map(&:underscore).join("~")
+      @model_name.split("::").map(&:underscore).join("~")
     end
 
     def param_key
-      model.to_s.split("::").map(&:underscore).join("_")
+      @model_name.split("::").map(&:underscore).join("_")
     end
 
     def pretty_name

data/lib/rails_admin/adapters/active_record.rb

@@ -4,7 +4,8 @@ require 'rails_admin/adapters/active_record/abstract_object'
 module RailsAdmin
   module Adapters
     module ActiveRecord
-      DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore]
+      DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore, :geometry]
+      DISABLED_COLUMN_MATCHERS = [/_array$/]
 
       def ar_adapter
         Rails.configuration.database_configuration[Rails.env]['adapter']
@@ -80,16 +81,17 @@ module RailsAdmin
       end
 
       def properties
-        columns = model.columns.reject {|c| c.type.blank? || DISABLED_COLUMN_TYPES.include?(c.type.to_sym) }
+        columns = model.columns.reject do |c|
+          c.type.blank? || DISABLED_COLUMN_TYPES.include?(c.type.to_sym) || DISABLED_COLUMN_MATCHERS.any? {|matcher| matcher.match(c.type.to_s)}
+        end
         columns.map do |property|
           {
             :name => property.name.to_sym,
             :pretty_name => property.name.to_s.tr('_', ' ').capitalize,
-            :type => property.type,
             :length => property.limit,
             :nullable? => property.null,
             :serial? => property.primary,
-          }
+          }.merge(type_lookup(property))
         end
       end
 
@@ -97,10 +99,6 @@ module RailsAdmin
         model.table_name
       end
 
-      def serialized_attributes
-        model.serialized_attributes.keys
-      end
-
       def encoding
         Rails.configuration.database_configuration[Rails.env]['encoding']
       end
@@ -173,6 +171,9 @@ module RailsAdmin
         when :boolean
           return ["(#{column} IS NULL OR #{column} = ?)", false] if ['false', 'f', '0'].include?(value)
           return ["(#{column} = ?)", true] if ['true', 't', '1'].include?(value)
+        when :decimal
+          return if value.blank?
+          ["(#{column} = ?)", value.to_f] if value.to_f.to_s == value
         when :integer, :belongs_to_association
           return if value.blank?
           ["(#{column} = ?)", value.to_i] if value.to_i.to_s == value
@@ -217,6 +218,14 @@ module RailsAdmin
         end
       end
 
+      def type_lookup(property)
+        if model.serialized_attributes[property.name.to_s]
+          {:type => :serialized}
+        else
+          {:type => property.type}
+        end
+      end
+
       def association_model_lookup(association)
         if association.options[:polymorphic]
           RailsAdmin::AbstractModel.polymorphic_parents(:active_record, association.name) || []