Replacing find search by where on select_profile_folder(lazy loading)

Rodrigo Souto
1 parent 256b8bf2
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/helpers/forms_helper.rb
app/views/cms/_text_editor_sidebar.rhtml
@@ -275,7 +275,7 @@ module FormsHelper
     if find_options.empty?
       folders = profile.folders
     else
-      folders = profile.folders.find :all, find_options
+      folders = profile.folders.where(find_options)
     end
     result = labelled_form_field(
       label_text,
@@ -13,7 +13,7 @@
           <%= select_profile_folder(
                 _('Choose folder to upload files:'),
                 :parent_id, profile, default_folder, {}, {},
-                {:conditions => 'type="Folder" or type="Gallery"'}
+                'type="Folder" or type="Gallery"'
           ) %>
         </div>
         <p><%= file_field_tag('file1') %></p>
	@@ -275,7 +275,7 @@ module FormsHelper		@@ -275,7 +275,7 @@ module FormsHelper
275	if find_options.empty?	275	if find_options.empty?
276	folders = profile.folders	276	folders = profile.folders
277	else	277	else
278	- folders = profile.folders.find :all, find_options	278	+ folders = profile.folders.where(find_options)
279	end	279	end
280	result = labelled_form_field(	280	result = labelled_form_field(
281	label_text,	281	label_text,
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	<%= select_profile_folder(	13	<%= select_profile_folder(
14	_('Choose folder to upload files:'),	14	_('Choose folder to upload files:'),
15	:parent_id, profile, default_folder, {}, {},	15	:parent_id, profile, default_folder, {}, {},
16	- {:conditions => 'type="Folder" or type="Gallery"'}	16	+ 'type="Folder" or type="Gallery"'
17	) %>	17	) %>
18	</div>	18	</div>
19	<p><%= file_field_tag('file1') %></p>	19	<p><%= file_field_tag('file1') %></p>