@@ -1,4 +1,7 @@ - + * Aliased Methods named_scope search to ext_search and paginate to ext_paginate to avoid conflicts. + * Updated the Readme + * Removed an unusued back_to helper + * Fixed a bug with simple_error_messages_for [joe1chen] * Fixed a bug in generators on Windows [Paolo Angelini] 2009-09-09 CHANGELOG @@ -69,5 +69,5 @@ Please contribute in coding, patch, and submitting translation api documentation Official Site can be found here:: http://www.lipsiadmin.com Community can be found here:: http://groups.google.com/group/lipsiadmin -Api documentation can be found here:: http://api.lipsiasoft.com +Api documentation can be found here:: http://api.lipsiadmin.com Follow us on twitter:: http://twitter.com/daddye \ No newline at end of file README.rdoc @@ -154,10 +154,12 @@ module Lipsiadmin # store_data(params, :include => :posts) # def store_data(params, options={}) + # Some can tell me that this method made two identical queries one for count one for paginate. + # We don't use the select count because in some circumstances require much time than select *. @model.send(:with_scope, :find => options) do - collection = @model.search(params) + collection = @model.ext_search(params) collection_count = collection.length - collection_paginated = collection.paginate(params) + collection_paginated = collection.ext_paginate(params) { :results => store_data_from(collection_paginated), :count => collection_count } end end lib/controller/ext.rb @@ -8,14 +8,14 @@ module Lipsiadmin # # Examples: # - # invoices = current_account.store.invoices.with(:order).search(params) + # invoices = current_account.store.invoices.with(:order).ext_search(params) # invoices_count = invoices.size - # invoices_paginated = invoices.paginate(params) + # invoices_paginated = invoices.ext_paginate(params) # module UtilityScopes def self.included(base)#:nodoc: base.class_eval do - named_scope :search, lambda { |params| + named_scope :ext_search, lambda { |params| order = params[:sort].blank? && params[:dir].blank? ? nil : "#{params[:sort]} #{params[:dir]}" conditions = nil @@ -26,13 +26,21 @@ module Lipsiadmin { :conditions => conditions } } - - named_scope :paginate, lambda { |params| + named_scope :ext_paginate, lambda { |params| order = params[:sort].blank? && params[:dir].blank? ? nil : "#{params[:sort]} #{params[:dir]}" { :order => order, :limit => params[:limit], :offset => params[:start] } } - named_scope :with, lambda { |*associations| { :include => associations } } + + # You or your plugins (ex: will_paginate) now can override the search/paginate + # at the moment we can't remove them for backward compatibility. + (class << self; self end).instance_eval do + %w(search paginate).each do |name| + define_method name do |*args| + send("ext_#{name}", *args) + end + end + end end end end lib/data_base/utility_scopes.rb @@ -179,11 +179,6 @@ module Lipsiadmin I18n.t("activerecord.attributes.#{instance}.#{method}", :default => method.to_s.humanize) end - # Store the location to come back from for example an extjs grid - def back_to(location) - content_tag(:script, "Backend.app.backTo(#{url_for(location)})", :type => Mime::JS) - end - # Generate the menu from the Lispiadmin::AccessControl def backend_menu config = AccountAccess.maps_for(current_account).collect(&:project_modules).flatten.uniq.collect(&:config) lib/view/helpers/backend_helper.rb add98dc9615b18e3f95b3d03865ea160b5761857 Davide D'Agostino DAddYE@MacBook.local http://github.com/Lipsiasoft/lipsiadmin/commit/c66b8644dd735ece86d35e3f20aa2e96ec930150 c66b8644dd735ece86d35e3f20aa2e96ec930150 2009-11-05T09:21:03-08:00 2009-11-05T09:21:03-08:00 Aliased Methods named_scope search to ext_search and paginate to ext_paginate to avoid conflicts. Updated the Readme Removed an unusued back_to helper f133396ecf14e7dc3e6e2e0dff37b2af1a8b7376 Davide D'Agostino DAddYE@MacBook.local