rails_admin 0.0.5 → 0.1.0

data/Gemfile

@@ -32,47 +32,22 @@ group :active_record do
 end
 
 group :mongoid do
-  case ENV['CI_ORM_VERSION']
-  when 'head'
-    gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/mshibuya/mongoid-paperclip.git', :branch => 'fix-stop-patching-logger'
-    # For now, carrierwave-mongoid's mongoid dependency is restricted to '~> 2.1'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/tanordheim/carrierwave-mongoid.git', :branch => 'mongoid_3_0'
-  else
-    platforms :ruby, :mswin, :mingw do
-      gem 'bson'
-      gem 'bson_ext'
-    end
-    gem 'mongoid'
-    gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
-  end
+  gem 'mongoid', '~> 3.0'
+  gem 'mongoid-paperclip', '~> 0.0.8', :require => 'mongoid_paperclip'
+  gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
 end
 
 group :debug do
-  platform :mri_18 do
-    gem 'ruby-debug'
-    gem 'linecache'
-  end
-
   platform :mri_19 do
-    gem 'ruby-debug19'
+    gem 'debugger'
     gem 'simplecov', :require => false
   end
-
-  platform :jruby do
-    gem 'ruby-debug'
-  end
-end
-
-platforms :jruby, :mingw_18, :ruby_18 do
-  gem 'fastercsv', '~> 1.5'
 end
 
 group :development, :test do
   gem 'cancan'
   gem 'devise'
-  gem 'paperclip', '~> 2.7'
+  gem 'paperclip'
 end
 
 gemspec

data/README.md

@@ -18,6 +18,20 @@ Hoeven][plukevdh], and [Rein Henrichs][reinh].
 [plukevdh]: https://github.com/plukevdh
 [reinh]: https://github.com/reinh
 
+## Announcements
+
+* for those with `rake db:migrate` errors, update to master and check that you see the line: "[RailsAdmin] RailsAdmin initialization disabled by default." when you launch the task. If not (or if migrations still don't work), open a ticket with an application on Github that can reproduce the issue.
+
+* `config.models do ... end` is deprecated (note the 's' to models, `config.model(MyModel) do .. end` is fine), for performance reasons (forces early loading of all application's models). Duplicate to each model instead, before next release. If you really need the old behavior:
+ 
+```ruby
+config.models.each do |m|
+  config.model m do
+    # <<<< here goes your code
+  end
+end
+```
+
 ## Features
 
 * Display database tables
@@ -43,6 +57,7 @@ Take RailsAdmin for a [test drive][demo] with sample data. ([Source code.][dummy
 [dummy_app]: https://github.com/bbenezech/dummy_app
 
 ## Installation
+
 In your `Gemfile`, add the following dependencies:
 
     gem 'fastercsv' # Only required on Ruby 1.8 and below
@@ -98,6 +113,7 @@ Optionally, you may wish to set up [Cancan](https://github.com/ryanb/cancan),
 More on that in the [Wiki](https://github.com/sferik/rails_admin/wiki)
 
 ## Usage
+
 Start the server:
 
     $ rails server
@@ -110,13 +126,15 @@ You should now be able to administer your site at
 All configuration documentation has moved to the wiki: https://github.com/sferik/rails_admin/wiki
 
 ## Screenshots
+
 ![Dashboard view](https://github.com/sferik/rails_admin/raw/master/screenshots/dashboard.png "dashboard view")
 ![Delete view](https://github.com/sferik/rails_admin/raw/master/screenshots/delete.png "delete view")
 ![List view](https://github.com/sferik/rails_admin/raw/master/screenshots/list.png "list view")
 ![Nested view](https://github.com/sferik/rails_admin/raw/master/screenshots/nested.png "nested view")
-![Polymophic edit view](https://github.com/sferik/rails_admin/raw/master/screenshots/polymorphic.png "polymorphic view")
+![Polymorphic edit view](https://github.com/sferik/rails_admin/raw/master/screenshots/polymorphic.png "polymorphic view")
 
 ## Support
+
 If you have a question, please check this README, the wiki, and the [list of
 known issues][troubleshoot].
 
@@ -130,6 +148,7 @@ list][list].
 If you think you found a bug in RailsAdmin, you can [submit an issue][issues].
 
 ## Contributing
+
 In the spirit of [free software][free-sw], **everyone** is encouraged to help
 improve this project.
 
@@ -180,7 +199,6 @@ Ideally, a bug report should include a pull request with failing specs.
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby implementations:
 
-* Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
 * [Rubinius][]

data/app/assets/javascripts/rails_admin/ra.filtering-select.js

@@ -40,7 +40,7 @@
         }).toArray();
       }
       var filtering_select = $('<div class="input-append filtering-select" style="float:left"></div>')
-      var input = this.input = $('<input type="search">')
+      var input = this.input = $('<input type="text">')
         .val(value)
         .addClass("ra-filtering-select-input")
         .attr('style', select.attr('style'))
@@ -83,7 +83,7 @@
         .keyup(function() {
           /* Clear select options and trigger change if selected item is deleted */
           if ($(this).val().length == 0) {
-            select.empty();
+            select.html($('<option value="" selected="selected"></option>'));
             select.trigger("change");
           }
         })

data/app/assets/javascripts/rails_admin/ra.nested-form-hooks.coffee

@@ -7,7 +7,7 @@ $(document).ready ->
     tab_content.children().last()
 
 $('form').live 'nested:fieldAdded', (content) ->
-  field = content.field.addClass('tab-pane')
+  field = content.field.addClass('tab-pane').attr('id', 'unique-id-' + (new Date().getTime()))
   new_tab = $('<li><a data-toggle="tab" href="#' + field.attr('id') + '">' + field.children('.object-infos').data('object-label') + '</a></li>')
   parent_group = field.closest('.control-group')
   controls = parent_group.children('.controls')

data/app/assets/javascripts/rails_admin/ra.remote-form.js

@@ -60,7 +60,7 @@
           },
           dataType: 'text'
         });
-      },100);
+      },200);
 
     },
 

data/app/assets/javascripts/rails_admin/ra.widgets.coffee

@@ -26,7 +26,10 @@ $(document).live 'rails_admin.dom_ready', ->
     # enumeration
 
     $('form [data-enumeration]').each ->
-      $(this).filteringSelect $(this).data('options')
+      if $(this).is('[multiple]')
+        $(this).filteringMultiselect $(this).data('options')
+      else
+        $(this).filteringSelect $(this).data('options')
 
     # fileupload
 
@@ -35,6 +38,24 @@ $(document).live 'rails_admin.dom_ready', ->
       $(this).find(".delete input[type='checkbox']").live 'click', ->
         $(input).children('.toggle').toggle('slow')
 
+    # fileupload-preview
+
+    $('form [data-fileupload]').change ->
+      input = this
+      image_container = $("#" + input.id).parent().children(".preview")
+      unless image_container.length
+        image_container = $("#" + input.id).parent().prepend($('<img />').addClass('preview')).find('img.preview')
+        image_container.parent().find('img:not(.preview)').hide()
+      ext = $("#" + input.id).val().split('.').pop().toLowerCase()
+      if input.files and input.files[0] and $.inArray(ext, ['gif','png','jpg','jpeg','bmp']) != -1
+        reader = new FileReader()
+        reader.onload = (e) ->
+          image_container.attr "src", e.target.result
+        reader.readAsDataURL input.files[0]
+        image_container.show()
+      else
+        image_container.hide()
+
     # filtering-multiselect
 
     $('form [data-filteringmultiselect]').each ->
@@ -62,6 +83,7 @@ $(document).live 'rails_admin.dom_ready', ->
       toggler = field.find('> .controls > .btn-group > .toggler')
       # add each nested field to a tab-pane and reference it in the nav
       content.children('.fields:not(.tab-pane)').addClass('tab-pane').each ->
+        $(this).attr('id', 'unique-id-' + (new Date().getTime()) + Math.floor(Math.random()*100000)) # some elements are created on the same ms
         nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>')
       # only if no tab is set to active
       if nav.find("> li.active").length == 0
@@ -88,7 +110,7 @@ $(document).live 'rails_admin.dom_ready', ->
       nav = field.find("> .controls > .nav")
       content = field.find("> .tab-content")
       toggler = field.find('> .controls > .toggler')
-      content.children(".fields:not(.tab-pane)").addClass('tab-pane').each ->
+      content.children(".fields:not(.tab-pane)").addClass('tab-pane active').each ->
         nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>')
       first_tab = nav.find("> li > a[data-toggle='tab']:first")
       first_tab.tab('show')
@@ -156,7 +178,7 @@ $(document).live 'rails_admin.dom_ready', ->
           CodeMirror.fromTextArea(textarea,{mode:options['options']['mode'],theme:options['options']['theme']})
           $(textarea).addClass('codemirrored')
 
-    array = $('form [data-richtext=codemirror]').not('.codemirrored')      
+    array = $('form [data-richtext=codemirror]').not('.codemirrored')
     if array.length
       @array = array
       if not window.CodeMirror
@@ -167,3 +189,21 @@ $(document).live 'rails_admin.dom_ready', ->
       else
         goCodeMirrors(@array)
 
+    # bootstrap_wysihtml5
+
+    goBootstrapWysihtml5s = (array) =>
+      array.each ->
+        $(@).addClass('bootstrap-wysihtml5ed')
+        $(@).closest('.controls').addClass('well')
+        $(@).wysihtml5()
+
+    array = $('form [data-richtext=bootstrap-wysihtml5]').not('.bootstrap-wysihtml5ed')
+    if array.length
+      @array = array
+      if not window.wysihtml5
+        options = $(array[0]).data('options')
+        $('head').append('<link href="' + options['csspath'] + '" rel="stylesheet" media="all" type="text\/css">')
+        $.getScript options['jspath'], (script, textStatus, jqXHR) =>
+          goBootstrapWysihtml5s(@array)
+      else
+        goBootstrapWysihtml5s(@array)

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

@@ -62,3 +62,5 @@ $(document).live 'rails_admin.dom_ready', ->
 
   $('.form-horizontal legend').has('i.icon-chevron-right').each ->
     $(this).siblings('.control-group').hide()
+
+  $(".table").tooltip selector: "th[rel=tooltip]"

data/app/assets/stylesheets/rails_admin/imports.css.scss.erb

@@ -1,3 +1,5 @@
+@charset "UTF-8";
+
 <%
   theme = ENV['RAILS_ADMIN_THEME'] || :default
 %>
@@ -25,6 +27,7 @@
 @import "rails_admin/jquery.ui.timepicker";
 @import "rails_admin/ra.calendar-additions";
 @import "rails_admin/ra.filtering-multiselect";
+@import "rails_admin/ra.widgets";
 @import "rails_admin/jquery.colorpicker";
 
 

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

@@ -0,0 +1,8 @@
+iframe.wysihtml5-sandbox{
+  height: 250px !important;
+  width: 75% !important;
+}
+.controls img.preview{
+  max-height: 100px;
+  max-width: 100px;
+}

data/app/controllers/rails_admin/main_controller.rb

@@ -29,7 +29,7 @@ module RailsAdmin
       self.send(params[:bulk_action]) if params[:bulk_action].in?(RailsAdmin::Config::Actions.all(:controller => self, :abstract_model => @abstract_model).select(&:bulkable?).map(&:route_fragment))
     end
 
-    def list_entries(model_config = @model_config, auth_scope_key = :index, additional_scope = get_association_scope_from_params, pagination = !(params[:associated_collection] || params[:all]))
+    def list_entries(model_config = @model_config, auth_scope_key = :index, additional_scope = get_association_scope_from_params, pagination = !(params[:associated_collection] || params[:all] || params[:bulk_ids]))
       scope = model_config.abstract_model.scoped
       if auth_scope = @authorization_adapter && @authorization_adapter.query(auth_scope_key, model_config.abstract_model)
         scope = scope.merge(auth_scope)
@@ -40,7 +40,7 @@ module RailsAdmin
     end
 
     private
-    
+
     def get_layout
       "rails_admin/#{request.headers['X-PJAX'] ? 'pjax' : 'application'}"
     end
@@ -113,7 +113,7 @@ module RailsAdmin
     end
 
     def check_for_cancel
-      if params[:_continue]
+      if params[:_continue] || (params[:bulk_action] && !params[:bulk_ids])
         redirect_to(back_or_index, :flash => { :info => t("admin.flash.noaction") })
       end
     end

data/app/helpers/rails_admin/application_helper.rb

@@ -10,8 +10,8 @@ module RailsAdmin
     end
 
     def current_action?(action, abstract_model = @abstract_model, object = @object)
-      @action.custom_key == action.custom_key && 
-      abstract_model.try(:to_param) == @abstract_model.try(:to_param) && 
+      @action.custom_key == action.custom_key &&
+      abstract_model.try(:to_param) == @abstract_model.try(:to_param) &&
       (@object.try(:persisted?) ? @object.id == object.try(:id) : !object.try(:persisted?))
     end
 
@@ -43,7 +43,7 @@ module RailsAdmin
     end
 
     def main_navigation
-      nodes_stack = RailsAdmin::Config.visible_models(:controller => self.controller)      
+      nodes_stack = RailsAdmin::Config.visible_models(:controller => self.controller)
       nodes_stack.group_by(&:navigation_label).map do |navigation_label, nodes|
 
         li_stack = nodes.select{|n| n.parent.nil? || !n.parent.to_s.in?(nodes_stack.map{|c| c.abstract_model.model_name }) }.map do |node|
@@ -63,6 +63,18 @@ module RailsAdmin
       end.join.html_safe
     end
 
+    def static_navigation
+      li_stack = RailsAdmin::Config.navigation_static_links.map do |title, url|
+        content_tag(:li, link_to(title.to_s, url, :target => '_blank')).html_safe
+      end.join.html_safe
+
+      if li_stack.present?
+        li_stack = %{<li class='nav-header'>#{RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')}</li>}.html_safe + li_stack
+      end
+
+      li_stack
+    end
+
     def navigation nodes_stack, nodes, level
       nodes.map do |node|
         %{
@@ -78,7 +90,6 @@ module RailsAdmin
       begin
         (parent_actions ||= []) << action
       end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent))
-      parent_actions << action(:dashboard) if parent_actions.last.key != :dashboard # in case chain is interrupted
 
       content_tag(:ul, :class => "breadcrumb") do
         parent_actions.map do |a|

data/app/helpers/rails_admin/form_builder.rb

@@ -1,31 +1,31 @@
-ActionView::Base.field_error_proc = Proc.new { |html_tag, instance| html_tag }
-
 module RailsAdmin
   class FormBuilder < ::ActionView::Helpers::FormBuilder
     include ::NestedForm::BuilderMixin
 
     def generate(options = {})
-      options.reverse_merge!({
-        :action => @template.controller.params[:action],
-        :model_config => @template.instance_variable_get(:@model_config),
-        :nested_in => false
-      })
+      without_field_error_proc_added_div do
+        options.reverse_merge!({
+          :action => @template.controller.params[:action],
+          :model_config => @template.instance_variable_get(:@model_config),
+          :nested_in => false
+        })
 
-      if options[:nested_in]
-        action = :nested
-      elsif @template.request.format == 'text/javascript'
-        action = :modal      
-      else
-        action = options[:action]
-      end
-      
-      groups = options[:model_config].send(action).with(:form => self, :object => @object, :view => @template).visible_groups
+        if options[:nested_in]
+          action = :nested
+        elsif @template.request.format == 'text/javascript'
+          action = :modal
+        else
+          action = options[:action]
+        end
+
+        groups = options[:model_config].send(action).with(:form => self, :object => @object, :view => @template).visible_groups
 
-      object_infos +
-      groups.map do |fieldset|
-        fieldset_for fieldset, options[:nested_in]
-      end.join.html_safe +
-      (options[:nested_in] ? '' : @template.render(:partial => 'submit_buttons'))
+        object_infos +
+        groups.map do |fieldset|
+          fieldset_for fieldset, options[:nested_in]
+        end.join.html_safe +
+        (options[:nested_in] ? '' : @template.render(:partial => 'rails_admin/main/submit_buttons'))
+      end
     end
 
     def fieldset_for fieldset, nested_in
@@ -43,14 +43,15 @@ module RailsAdmin
     def field_wrapper_for field, nested_in
       if field.label
         # do not show nested field if the target is the origin
-        unless field.inverse_of.presence && field.inverse_of == nested_in
+        unless field.inverse_of.presence && field.inverse_of == nested_in &&
+          @template.instance_variable_get(:@model_config).abstract_model == field.associated_model_config.abstract_model
           @template.content_tag(:div, :class => "control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", :id => "#{dom_id(field)}_field") do
             label(field.method_name, field.label, :class => 'control-label') +
             (field.nested_form ? field_for(field) : input_for(field))
           end
         end
       else
-        (field.nested_form ? field_for(field) : input_for(field))      
+        (field.nested_form ? field_for(field) : input_for(field))
       end
     end
 
@@ -85,18 +86,6 @@ module RailsAdmin
       %{<span style="display:none" class="object-infos" data-model-label="#{model_label}" data-object-label="#{object_label}"></span>}.html_safe
     end
 
-    def javascript_for(field, options = {}, &block)
-      %{<script type="text/javascript">
-          jQuery(function($) {
-            if(!$("#{jquery_namespace(field)}").parents(".fields_blueprint").length) {
-              if(#{options[:modal] == false ? '!$("#modal").length' : 'true'}) {
-                #{@template.capture(&block)}
-              }
-            }
-          });
-        </script>}.html_safe
-    end
-
     def jquery_namespace field
       %{#{(@template.controller.params[:modal] ? '#modal ' : '')}##{dom_id(field)}_field}
     end
@@ -113,5 +102,16 @@ module RailsAdmin
     def dom_name field
       (@dom_name ||= {})[field.name] ||= %{#{@object_name}#{options[:index] && "[#{options[:index]}]"}[#{field.method_name}]#{field.is_a?(Config::Fields::Association) && field.multiple? ? '[]' : ''}}
     end
+    
+    protected
+      def without_field_error_proc_added_div
+        default_field_error_proc = ::ActionView::Base.field_error_proc
+        begin
+          ::ActionView::Base.field_error_proc = Proc.new { |html_tag, instance| html_tag }
+          yield
+        ensure
+          ::ActionView::Base.field_error_proc = default_field_error_proc
+        end
+      end
   end
 end