Download as
Browse Code »

Commit 6da1fe9291d3632fa93d12c3103fba223cda3372

Authored by Braulio Bhavamitra
Committed by Daniela Feitosa
1 parent 3371aaf9
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Do not index address for profiles (private data)

Showing 1 changed file with 8 additions and 8 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @6da1fe9
... ... @@ -204,7 +204,7 @@ class Profile < ActiveRecord::Base
204 204 end
205 205  
206 206 belongs_to :region
207   -
  207 +
208 208 def location(separator = ' - ')
209 209 myregion = self.region
210 210 if myregion
... ... @@ -285,12 +285,12 @@ class Profile < ActiveRecord::Base
285 285 true
286 286 end
287 287  
288   - # registar callback for creating boxes after the object is created.
  288 + # registar callback for creating boxes after the object is created.
289 289 after_create :create_default_set_of_boxes
290 290  
291 291 # creates the initial set of boxes when the profile is created. Can be
292 292 # overriden for each subclass to create a custom set of boxes for its
293   - # instances.
  293 + # instances.
294 294 def create_default_set_of_boxes
295 295 if template
296 296 apply_template(template, :copy_articles => false)
... ... @@ -405,7 +405,7 @@ class Profile < ActiveRecord::Base
405 405  
406 406 # returns +false+
407 407 def person?
408   - self.kind_of?(Person)
  408 + self.kind_of?(Person)
409 409 end
410 410  
411 411 def enterprise?
... ... @@ -513,7 +513,7 @@ private :generate_url, :url_options
513 513  
514 514 after_create :insert_default_article_set
515 515 def insert_default_article_set
516   - if template
  516 + if template
517 517 copy_articles_from template
518 518 else
519 519 default_set_of_articles.each do |article|
... ... @@ -583,7 +583,7 @@ private :generate_url, :url_options
583 583 raise _("%s can't have members") % self.class.name
584 584 end
585 585 end
586   -
  586 +
587 587 def remove_member(person)
588 588 self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
589 589 end
... ... @@ -909,7 +909,7 @@ private :generate_url, :url_options
909 909 acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
910 910 # searched fields
911 911 {:name => {:type => :text, :boost => 2.0}},
912   - {:identifier => :text}, {:address => :text}, {:nickname => :text},
  912 + {:identifier => :text}, {:nickname => :text},
913 913 # filtered fields
914 914 {:public => :boolean}, {:environment_id => :integer},
915 915 {:category_filter => :integer},
... ... @@ -929,7 +929,7 @@ private :generate_url, :url_options
929 929  
930 930 def control_panel_settings_button
931 931 {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
932   - end
  932 + end
933 933  
934 934 def followed_by?(person)
935 935 person.is_member_of?(self)
... ...