admin_interface 1.2.2 → 1.3.0

data/README.rdoc

@@ -15,6 +15,14 @@ You should be using v1.2.0+.
 
   gem "admin_interface"
 
+AdminInterface uses several gems. So put these in your Gemfile
+
+  gem 'ransack' # new version of meta_search
+  gem 'kaminari' # pagination
+  gem 'dynamic_form' # for error_messages_for
+  # Optional
+  gem 'simple_form' # you should use this, much easier forms
+
 === Earlier Rails Versions
 
 If you're using Rails 3.0 or earlier use
@@ -23,12 +31,6 @@ Add following to your Gemfile
 
   gem "admin_interface", "~> 1.0.0"
 
-AdminInterface uses several gems. So put these in your Gemfile
-
-  gem 'inherited_resources'
-  gem 'meta_search'
-  gem 'kaminari'
-
 Or install as plugin from Github.
 
   rails plugin install git://github.com/joost/admin_interface.git
@@ -50,7 +52,7 @@ Next, add following routes to config/routes.rb.
   namespace :admin do
     root :to => 'base#index'
     # Add the following after you've used the admin_scaffold generator
-    resources :model do
+    resources :model, :another_model do
       delete 'destroy_all', :on => :collection
     end
   end
@@ -108,4 +110,4 @@ welcome!
 Kudos, credits or whatever you like more go to:
 * Jean-Philippe Lang (creator of {Redmine}[http://www.redmine.org/]).
   
-Copyright (c) 2010 Joost Hietbrink, released under the MIT license
+Copyright (c) 2011 Joost Hietbrink, released under the MIT license

data/admin_interface.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "devise/version"
 
 Gem::Specification.new do |spec|
   spec.name = "admin_interface"
-  spec.version = '1.2.2'
+  spec.version = '1.3.0'
   spec.platform = Gem::Platform::RUBY
   spec.summary = "A Rails admin interface generator. Theme stolen from Redmine."
   spec.email = "joost@joopp.com"
@@ -12,9 +11,9 @@ Gem::Specification.new do |spec|
   spec.description = "A Rails admin interface generator. Theme stolen from Redmine. Similar to web-app-theme but better ;)."
   spec.authors = ['Joost Hietbrink']
 
-  # kaminari (pagination), meta_search (search), inherited_resources (coolness)
+  # kaminari (pagination), ransack (search), inherited_resources (coolness)
   spec.add_dependency('kaminari', '>= 0.12.4')
-  spec.add_dependency('meta_search', '>= 1.1.0.pre2')
+  spec.add_dependency('ransack')
   spec.add_dependency('inherited_resources', '>= 1.2.2')
 
   spec.files = `git ls-files`.split("\n")

data/lib/generators/admin_interface/admin_interface_generator.rb

@@ -32,12 +32,14 @@ class AdminInterfaceGenerator < Rails::Generators::Base
   end
 
   def add_admin_route
-    route "namespace :admin do"
-    route "  root :to => 'base#index"
-    route "  # resources :some_model do"
-    route "  #   delete 'delete_all', :on => :collection"
-    route "  # end"
-    route "end"
+    route <<ROUTE
+namespace :admin do
+    root :to => 'base#index'
+    # resources :some_model do
+    #   delete 'destroy_all', :on => :collection
+    # end
+  end
+ROUTE
   end
 
   def show_readme

data/lib/generators/admin_interface/templates/controllers/resource_controller.rb

@@ -17,9 +17,9 @@ protected
   # Overwrites inherited_resources gem version.
   # Use meta_search and kaminari gem to load collection
   def collection
-    @search ||= end_of_association_chain.search(params[:search])
+    @search ||= end_of_association_chain.search(params[:q])
     get_collection_ivar || begin
-      c = @search.page(params[:page]).per(params[:per])
+      c = @search.result.page(params[:page]).per(params[:per])
       set_collection_ivar(c.respond_to?(:scoped) ? c.scoped : c)
     end
   end

data/lib/generators/admin_interface/templates/views/index.html.erb

@@ -3,7 +3,7 @@
 <div class="splitcontentleft">
 	<p>
 	  Welcome to the admin area!
-	  This file is in <%= link_to('/app/views/admin/index.html.erb', "file://#{File.join(RAILS_ROOT, '/app/views/admin/index.html.erb')}", :class => 'external') %>.<br />You should change it.
+	  This file is in <%= link_to('/app/views/admin/index.html.erb', "file://#{File.join(Rails.root, '/app/views/admin/base/index.html.erb')}", :class => 'external') %>.<br />You should change it.
 	</p>
 	Styling is pretty simpel but useful. It all comes from Redmine :).
 	  <ul>

data/lib/generators/admin_interface/templates/views/layout.html.erb

@@ -44,7 +44,7 @@
       <div id="ajax-indicator" style="display:none;"><span>Loading...</span></div>
 
       <div id="footer">
-        Powered by <a href="mailto:team@truvolabs.com">TruvoLabs</a> &copy; 2009
+        Powered by <a href="mailto:your@email.com">Your Name</a> &copy; 2011
       </div>
     </div>
   </body>

data/lib/generators/admin_scaffold/templates/view_index.html.erb

@@ -5,7 +5,7 @@
         # Check https://github.com/ernie/meta_search for options.
         # Simply change :id_equals into :name_contains, etc.
       %>
-      <%%= f.text_field :id_equals, :placeholder => 'Search by ID' %>
+      <%%= f.text_field :id_eq, :placeholder => 'Search by ID' %>
     <%% end %>
 </div>
 

metadata

@@ -1,59 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: admin_interface
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  version: 1.2.2
 platform: ruby
-authors: 
+authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: kaminari
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70276621640140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: meta_search
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70276621640140
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: &70276621639180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0.pre2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: inherited_resources
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70276621639180
+- !ruby/object:Gem::Dependency
+  name: inherited_resources
+  requirement: &70276621637980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
-  version_requirements: *id003
-description: A Rails admin interface generator. Theme stolen from Redmine. Similar to web-app-theme but better ;).
+  prerelease: false
+  version_requirements: *70276621637980
+description: A Rails admin interface generator. Theme stolen from Redmine. Similar
+  to web-app-theme but better ;).
 email: joost@joopp.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - README.rdoc
 - admin_interface.gemspec
@@ -255,30 +252,26 @@ files:
 - vendor/assets/stylesheets/admin_interface.css.scss
 homepage: http://github.com/joost/admin_interface
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Rails admin interface generator. Theme stolen from Redmine.
 test_files: []
-