Modified: trunk/app/controllers/search_controller.rb (2219 => 2220)
--- trunk/app/controllers/search_controller.rb 2009-06-10 15:12:11 UTC (rev 2219)
+++ trunk/app/controllers/search_controller.rb 2009-06-10 15:17:15 UTC (rev 2220)
@@ -179,11 +179,15 @@
def search_model
+ model_name = params[:type].singularize.camelize
+ model_name = Conf.model_aliases[model_name] if Conf.model_aliases[model_name]
+
+ model = eval(model_name)
+
@collection_label = params[:type].singularize
- @controller_name = Conf.model_aliases[params[:type].camelize.singularize].underscore.pluralize
+ @controller_name = model_name.underscore.pluralize
@visible_name = params[:type].capitalize
@query_type = params[:type]
- model = eval(Conf.model_aliases[params[:type].singularize.camelize])
@query = params[:query] || ''
@query.strip!
Modified: trunk/config/default_settings.yml (2219 => 2220)
--- trunk/config/default_settings.yml 2009-06-10 15:12:11 UTC (rev 2219)
+++ trunk/config/default_settings.yml 2009-06-10 15:17:15 UTC (rev 2220)
@@ -190,6 +190,16 @@
search_categories: [all, users, groups, workflows, files, packs]
+# default_search_size - The default number of items shown in each search result
+# page.
+
+default_search_size: 10
+
+# max_search_size - The maximum number of items shown in each search result
+# page.
+
+max_search_size: 100
+
# email - These are the email addresses used for sending notifications and the
# email address to send feedback entered from the web site.
#
@@ -372,13 +382,3 @@
label_icons:
-# default_search_size - The default number of items shown in each search result
-# page.
-
-default_search_size: 10
-
-# max_search_size - The maximum number of items shown in each search result
-# page.
-
-max_search_size: 100
-