rails_admin 0.0.1 → 0.0.2

data/README.md

@@ -1,4 +1,4 @@
-# RailsAdmin [![Build Status](https://secure.travis-ci.org/sferik/rails_admin.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/sferik/rails_admin.png?travis)][gemnasium] [![Click here to lend your support to: RailsAdmin and make a donation at www.pledgie.com !](https://www.pledgie.com/campaigns/15917.png?skin_name=chrome)][pledgie]
+# RailsAdmin [![Build Status](https://secure.travis-ci.org/sferik/rails_admin.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/sferik/rails_admin.png?travis)][gemnasium] [![Click here to lend your support to: RailsAdmin and make a donation at www.pledgie.com !](https://www.pledgie.com/campaigns/15917.png)][pledgie]
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
 [travis]: http://travis-ci.org/sferik/rails_admin
@@ -18,7 +18,7 @@ Hoeven][plukevdh], and [Rein Henrichs][reinh].
 [plukevdh]: https://github.com/plukevdh
 [reinh]: https://github.com/reinh
 
-## <a name="features"></a>Features
+## Features
 
 * Display database tables
 * Create new data
@@ -35,14 +35,14 @@ Hoeven][plukevdh], and [Rein Henrichs][reinh].
   * ActiveRecord
   * Mongoid [new]
 
-## <a name="demo"></a>Demo
+## Demo
 
 Take RailsAdmin for a [test drive][demo] with sample data. ([Source code.][dummy_app])
 
 [demo]: http://rails-admin-tb.herokuapp.com/
 [dummy_app]: https://github.com/bbenezech/dummy_app
 
-## <a name="installation"></a>Installation
+## Installation
 In your `Gemfile`, add the following dependencies:
 
     gem 'fastercsv' # Only required on Ruby 1.8 and below
@@ -72,7 +72,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)
 
-## <a name="usage"></a>Usage
+## Usage
 Start the server:
 
     $ rails server
@@ -80,63 +80,79 @@ Start the server:
 You should now be able to administer your site at
 [http://localhost:3000/admin](http://localhost:3000/admin).
 
-## <a name="configuration"></a>Configuration
+## Configuration
 
 All configuration documentation has moved to the wiki: https://github.com/sferik/rails_admin/wiki
 
-## <a name="support"></a>Support
-Please see [list of known issues](https://github.com/sferik/rails_admin/wiki/Troubleshoot) first.
+## 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")
+
+## Support
+If you have a question, please check this README, the wiki, and the [list of
+known issues][troubleshoot].
 
-If you have a question, please check this README, the wiki, and the list of known issues.
+[troubleshoot]: https://github.com/sferik/rails_admin/wiki/Troubleshoot
 
 If you still have a question, you can ask the [official RailsAdmin mailing
-list](http://groups.google.com/group/rails_admin) or ping sferik on IRC in
-[#railsadmin on
-irc.freenode.net](http://webchat.freenode.net/?channels=railsadmin).
+list][list].
+
+[list]: http://groups.google.com/group/rails_admin
 
-If you think you found a bug in RailsAdmin, you can [submit an
-issue](https://github.com/sferik/rails_admin#issues).
-No feature requests or questions please (the mailing list is
-active and is the preferred venue for feature requests and questions).
+If you think you found a bug in RailsAdmin, you can [submit an issue][issues].
 
-## <a name="contributing"></a>Contributing
-In the spirit of [free software](http://www.fsf.org/licensing/essays/free-sw.html),
-**everyone** is encouraged to help improve this project.
+## Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
 
 Here are some ways *you* can contribute:
 
 * by using alpha, beta, and prerelease versions
 * by reporting bugs
 * by suggesting new features
-* by [translating to a new language](https://github.com/sferik/rails_admin/wiki/Translations)
 * by writing or editing documentation
 * by writing specifications
-* by writing code (**no patch is too small**: fix typos, add comments, clean up inconsistent whitespace)
+* by writing code (**no patch is too small**: fix typos, add comments, clean up
+  inconsistent whitespace)
 * by refactoring code
-* by resolving [issues](https://github.com/sferik/rails_admin/issues)
+* by fixing [issues][]
 * by reviewing patches
-* [financially](http://pledgie.com/campaigns/15917)
-
-## <a name="issues"></a>Submitting an Issue
-We use the [GitHub issue tracker](https://github.com/sferik/rails_admin/issues) to track bugs and
-features. Before submitting a bug report or feature request, please check to make sure it hasn't already
-been submitted. You can indicate support for an existing issue by voting it up. When submitting a
-bug report, please include a [Gist](https://gist.github.com/) that includes a stack trace and any
-details that may be necessary to reproduce the bug, including your gem version, Ruby version, and
-operating system. Ideally, a bug report should include a pull request with failing specs.
-
-## <a name="pulls"></a>Submitting a Pull Request
-1. Fork the project.
-2. Create a topic branch.
-3. Implement your feature or bug fix.  *NOTE* - there's a small test app located in the
-spec/dummy_app directory that you can use to experiment with rails_admin.
-4. Add documentation for your feature or bug fix.
-5. Add specs for your feature or bug fix.
-6. Commit and push your changes.
-7. Submit a pull request. Please do not include changes to the gemspec, version, or history file.
-(If you want to create your own version for some reason, please do so in a separate commit.)
-
-## <a name="versions"></a>Supported Ruby Versions
+* [financially][pledgie]
+
+[issues]: https://github.com/sferik/rails_admin/issues
+
+## Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
+7. Run `open coverage/index.html`. If your changes are not completely covered
+   by your tests, return to step 3.
+8. Add, commit, and push your changes.
+9. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/
+
+## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby implementations:
 
 * Ruby 1.8.7
@@ -147,10 +163,3 @@ This library aims to support and is [tested against][travis] the following Ruby
 
 [rubinius]: http://rubini.us/
 [jruby]: http://jruby.org/
-
-## <a name="screenshots"></a>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")

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

@@ -4,7 +4,7 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # colorpicker
 
-    $('[data-color]').each ->
+    $('form [data-color]').each ->
       that = this
       $(this).ColorPicker
         color: $(that).val()
@@ -20,24 +20,24 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # datetime
 
-    $('[data-datetimepicker]').each ->
+    $('form [data-datetimepicker]').each ->
       $(this).datetimepicker $(this).data('options')
 
     # enumeration
 
-    $('[data-enumeration]').each ->
+    $('form [data-enumeration]').each ->
       $(this).filteringSelect $(this).data('options')
 
     # fileupload
 
-    $('[data-fileupload]').each ->
+    $('form [data-fileupload]').each ->
       input = this
       $(this).find(".delete input[type='checkbox']").live 'click', ->
         $(input).children('.toggle').toggle('slow')
 
     # filtering-multiselect
 
-    $('[data-filteringmultiselect]').each ->
+    $('form [data-filteringmultiselect]').each ->
       $(this).filteringMultiselect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
         $(this).parents('.control-group').find('.btn').remove()
@@ -46,7 +46,7 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # filtering-select
 
-    $('[data-filteringselect]').each ->
+    $('form [data-filteringselect]').each ->
       $(this).filteringSelect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
         $(this).parents('.control-group').find('.btn').remove()
@@ -55,7 +55,7 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # nested-many
 
-    $('[data-nestedmany]').each ->
+    $('form [data-nestedmany]').each ->
       field = $(this).parents('.control-group').first()
       nav = field.find('> .controls > .nav')
       content = field.find('> .tab-content')
@@ -81,7 +81,7 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # nested-one
 
-    $('[data-nestedone]').each ->
+    $('form [data-nestedone]').each ->
       field = $(this).parents('.control-group').first()
       nav = field.find("> .controls > .nav")
       content = field.find("> .tab-content")
@@ -100,7 +100,7 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # polymorphic-association
 
-    $('[data-polymorphic]').each ->
+    $('form [data-polymorphic]').each ->
       type_select = $(this)
       field = type_select.parents('.control-group').first()
       object_select = field.find('select').last()
@@ -124,11 +124,12 @@ $(document).live 'rails_admin.dom_ready', ->
 
     # ckeditor
 
-    $('[data-richtext=ckeditor]').each ->
+    $('form [data-richtext=ckeditor]').not('.ckeditored').each ->
       window.CKEDITOR_BASEPATH = '/assets/ckeditor/'
       options = $(this).data('options')
       if not window.CKEDITOR
         $(window.document).append('<script src="' + options['jspath'] + '"><\/script>')
       if instance = window.CKEDITOR.instances[this.id]
-        window.CKEDITOR.remove(instance)
+        instance.destroy(true)
       window.CKEDITOR.replace(this, options['options'])
+      $(this).addClass('ckeditored')

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

@@ -60,6 +60,3 @@ $(document).live 'rails_admin.dom_ready', ->
 
   $('.form-horizontal legend').has('i.icon-chevron-right').each ->
     $(this).siblings('.control-group').hide()
-
-  $('[rel=tooltip]').tooltip(delay: { show: 200, hide: 500 });
-

data/app/helpers/rails_admin/application_helper.rb

@@ -96,8 +96,8 @@ module RailsAdmin
       actions.map do |action|
         wording = wording_for(:menu, action)
         %{
-          <li data-original-title="#{wording}" rel="#{'tooltip' if only_icon}" class="icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}">
-            <a class="pjax" href="#{url_for({ :action => action.action_name, :controller => 'rails_admin/main', :model_name => abstract_model.try(:to_param), :id => (object.try(:persisted?) && object.try(:id) || nil) })}">
+          <li title="#{wording if only_icon}" rel="#{'tooltip' if only_icon}" class="icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}">
+            <a class="#{action.key == :show_in_app ? '' : 'pjax'}" href="#{url_for({ :action => action.action_name, :controller => 'rails_admin/main', :model_name => abstract_model.try(:to_param), :id => (object.try(:persisted?) && object.try(:id) || nil) })}">
               <i class="#{action.link_icon}"></i>
               <span#{only_icon ? " style='display:none'" : ""}>#{wording}</span>
             </a>

data/app/helpers/rails_admin/form_builder.rb

@@ -41,12 +41,16 @@ module RailsAdmin
     end
 
     def field_wrapper_for field, nested_in
-      # do not show nested field if the target is the origin
-      unless field.inverse_of.presence && field.inverse_of == nested_in
-        @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))
+      if field.label
+        # do not show nested field if the target is the origin
+        unless field.inverse_of.presence && field.inverse_of == nested_in
+          @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))      
       end
     end
 

data/lib/rails_admin/adapters/active_record.rb

@@ -35,7 +35,9 @@ module RailsAdmin
         scope = scope.where(model.primary_key => options[:bulk_ids]) if options[:bulk_ids]
         scope = scope.where(query_conditions(options[:query])) if options[:query]
         scope = scope.where(filter_conditions(options[:filters])) if options[:filters]
-        scope = scope.page(options[:page]).per(options[:per]) if options[:page] && options[:per]
+        if options[:page] && options[:per]
+          scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per])
+        end
         scope = scope.reorder("#{options[:sort]} #{options[:sort_reverse] ? 'asc' : 'desc'}") if options[:sort]
         scope
       end

data/lib/rails_admin/adapters/mongoid.rb

@@ -35,11 +35,13 @@ module RailsAdmin
         scope = scope.any_in(:_id => options[:bulk_ids]) if options[:bulk_ids]
         scope = scope.where(query_conditions(options[:query])) if options[:query]
         scope = scope.where(filter_conditions(options[:filters])) if options[:filters]
-        scope = scope.page(options[:page]).per(options[:per]) if options[:page] && options[:per]
+        if options[:page] && options[:per]
+          scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per])
+        end
         scope = sort_by(options, scope) if options[:sort]
         scope
       end
-      
+
       def count(options = {},scope=nil)
         all(options.merge({:limit => false, :page => false}), scope).count
       end
@@ -317,7 +319,7 @@ module RailsAdmin
           association.foreign_key.to_sym rescue nil
         end
       end
-      
+
       def association_type_lookup(macro)
         case macro.to_sym
         when :belongs_to, :referenced_in, :embedded_in

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

@@ -18,7 +18,6 @@ module RailsAdmin
           end
         end
 
-
         register_instance_option :link_icon do
           'icon-eye-open'
         end

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

@@ -10,10 +10,16 @@ module RailsAdmin
           register_instance_option :view_helper do
             :hidden_field
           end
-          
-          register_instance_option(:partial) do
-            :form_field
+
+          register_instance_option :label do
+            false
+          end
+
+          register_instance_option :help do
+            false
           end
+
+
         end
       end
     end

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

@@ -1,9 +1,10 @@
 class RailsAdmin::History < ActiveRecord::Base
-
   self.table_name = :rails_admin_histories
 
   IGNORED_ATTRS = Set[:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on]
 
+  attr_accessible :message, :item, :table, :username
+
   def self.latest
     self.limit(100)
   end
@@ -53,7 +54,7 @@ class RailsAdmin::History < ActiveRecord::Base
     else
       history = history.order('created_at DESC')
     end
-    all ? history : history.page(page.presence || "1").per(per_page)
+    all ? history : history.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)
   end
 
   def self.history_for_object(model, object, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
@@ -64,6 +65,6 @@ class RailsAdmin::History < ActiveRecord::Base
     else
       history = history.order('created_at DESC')
     end
-    all ? history : history.page(page.presence || "1").per(per_page)
+    all ? history : history.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)
   end
 end

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -69,7 +69,7 @@ module RailsAdmin
           versions = Version.where :item_type => model.model.name
           versions = versions.where("event LIKE ?", "%#{query}%") if query.present?
           versions = versions.order(sort_reverse == "true" ? "#{sort} DESC" : sort)
-          versions = all ? versions : versions.page(page.presence || "1").per(per_page)
+          versions = all ? versions : versions.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)
           versions.map{|version| VersionProxy.new(version, @user_class)}
         end
 
@@ -83,7 +83,7 @@ module RailsAdmin
           versions = Version.where :item_type => model.model.name, :item_id => object.id
           versions = versions.where("event LIKE ?", "%#{query}%") if query.present?
           versions = versions.order(sort_reverse == "true" ? "#{sort} DESC" : sort)
-          versions = all ? versions : versions.page(page.presence || "1").per(per_page)
+          versions = all ? versions : versions.send(Kaminari.config.page_method_name, page.presence || "1").per(per_page)
           versions.map{|version| VersionProxy.new(version, @user_class)}
         end
       end

data/lib/rails_admin/version.rb

@@ -1,3 +1,3 @@
 module RailsAdmin
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/dummy_app/app/active_record/ball.rb

@@ -1,4 +1,5 @@
 class Ball < ActiveRecord::Base
+  attr_accessible :color
 
   validates_presence_of :color
 

data/spec/dummy_app/app/active_record/category.rb

@@ -1,3 +1,5 @@
 class Category < ActiveRecord::Base
+  attr_accessible :parent_category_id
+
   belongs_to :parent_category, :class_name => "Category"
 end

data/spec/dummy_app/app/active_record/cms/basic_page.rb

@@ -2,6 +2,8 @@ module Cms
   class BasicPage < ActiveRecord::Base
     self.table_name = :cms_basic_pages
 
+    attr_accessible :title, :content
+
     validates :title, :content, :presence => true
   end
 end

data/spec/dummy_app/app/active_record/comment.rb

@@ -1,3 +1,5 @@
 class Comment < ActiveRecord::Base
+  attr_accessible :commentable_id, :commentable_type, :content
+
   belongs_to :commentable, :polymorphic => true
 end