Download as
Browse Code »

Commit e9d95cb78ff0926eccbcba2862150909319b5da3

Authored by Antonio Terceiro
1 parent 095531ac
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Restrict media search to files

Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @e9d95cb
... ... @@ -265,7 +265,7 @@ class CmsController < MyProfileController
265 265  
266 266 def search
267 267 query = params[:q]
268   - results = query.blank? ? [] : profile.articles.published.find_by_contents(query)
  268 + results = query.blank? ? [] : profile.files.published.find_by_contents(query)
269 269 render :text => article_list_to_json(results), :content_type => 'application/json'
270 270 end
271 271 def media_upload
... ...
app/models/profile.rb
  Diff comments   View file @e9d95cb
... ... @@ -164,6 +164,8 @@ class Profile < ActiveRecord::Base
164 164 has_many :articles, :dependent => :destroy
165 165 belongs_to :home_page, :class_name => Article.name, :foreign_key => 'home_page_id'
166 166  
  167 + has_many :files, :class_name => 'UploadedFile'
  168 +
167 169 acts_as_having_image
168 170  
169 171 has_many :tasks, :dependent => :destroy, :as => 'target'
... ...