browsercms 3.3.3 → 3.3.4

data/app/controllers/cms/content_block_controller.rb

@@ -127,6 +127,7 @@ class Cms::ContentBlockController < Cms::BaseController
       options[:page] = params[:page]    
       options[:order] = model_class.default_order if model_class.respond_to?(:default_order)
       options[:order] = params[:order] unless params[:order].blank?
+
       scope = model_class.respond_to?(:list) ? model_class.list : model_class
       @blocks = scope.searchable? ? scope.search(params[:search]).paginate(options) : scope.paginate(options)
       check_permissions

data/app/models/html_block.rb

@@ -4,10 +4,11 @@ class HtmlBlock < ActiveRecord::Base
   
   validates_presence_of :name
   
-  # Override of search scope from searching behavior to deal with include_body 
+  # Override of search scope from searching behavior to deal with include_body
+  # @todo - This might not be necessary. When cucumber is updated, verify if i can just override '"#searchable_columns' instead
+  # which will be more DRY.
   scope :search, lambda{|search_params|
     term = search_params.is_a?(Hash) ? search_params[:term] : search_params  
-    order = search_params.is_a?(Hash) && search_params[:order] ? search_params[:order] : "html_blocks.name"
     include_body = search_params.is_a?(Hash) ? search_params[:include_body] : false
     conditions = []
     columns = ["name"]
@@ -25,7 +26,6 @@ class HtmlBlock < ActiveRecord::Base
     end
     scope = {}
     scope[:conditions] = conditions if conditions
-    scope[:order] = order if order
     scope
   }
   

data/app/views/cms/blocks/index.html.erb

@@ -66,8 +66,7 @@
         <th<%= attrs %>>
           <div class="dividers">
             <% if column[:order] %>
-              <%= link_to column[:label], cms_index_path_for(content_type, 
-                :order => determine_order(params[:order], column[:order])) %>
+              <%= link_to column[:label], params.merge(:order => determine_order(params[:order], column[:order])) %>
             <% else %>
               <%= column[:label] %>
             <% end %>

data/lib/cms/behaviors/searching.rb

@@ -14,9 +14,8 @@ module Cms
           extend ClassMethods
         
           #This is in a method to allow classes to override it
-          scope :search, lambda{|search_params| 
-            term = search_params.is_a?(Hash) ? search_params[:term] : search_params  
-            order = search_params.is_a?(Hash) && search_params[:order] ? search_params[:order] : default_order_for_search
+          scope :search, lambda{|search_params|
+            term = search_params.is_a?(Hash) ? search_params[:term] : search_params
             conditions = []
             unless term.blank?
               searchable_columns.each do |c|
@@ -31,8 +30,7 @@ module Cms
             end
             scope = {}
             scope[:conditions] = conditions if conditions
-            scope[:order] = order if order
-            scope                      
+            scope
           }
         end
       end
@@ -40,9 +38,6 @@ module Cms
         def searchable_columns
           @searchable_columns
         end
-        def default_order_for_search
-          "#{table_name}.#{searchable_columns.first}"
-        end
       end
     end
   end

data/lib/cms/version.rb

@@ -2,5 +2,5 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.3.3"
+  VERSION = "3.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000Z
+date: 2012-04-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70325499092900 !ruby/object:Gem::Requirement
+  requirement: &70173086668180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70325499092900
+  version_requirements: *70173086668180
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &70325499092440 !ruby/object:Gem::Requirement
+  requirement: &70173086667720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70325499092440
+  version_requirements: *70173086667720
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70325499092060 !ruby/object:Gem::Requirement
+  requirement: &70173086667340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325499092060
+  version_requirements: *70173086667340
 description: Web Content Management in Rails.
 email: github@browsermedia.com
 executables:
@@ -1363,7 +1363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -235219671508208909
+      hash: -3760733705692600221
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15