Download as
Browse Code »

Commit bd3ef039d20fdf0705eda1443e5ea3b08d2a250c

Authored by Rodrigo Souto
1 parent 256b8bf2
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Replacing find search by where on select_profile_folder(lazy loading)

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