Download as
Browse Code »

Commit e78974a8bd3efc6203d4a7de297f9cd71194ce76

Authored by Larissa Reis
1 parent bfaf133d
Exists in staging and in 12 other branches api_roles, elasticsearch, elasticsearch_to_merge, external_followers, federation_oauth_provider, follower_permition, master, oauth_external_login, private-scraps-rebase, production, profile_api_improvements, user_mention

Fixes indentation and typo

Showing 4 changed files with 7 additions and 7 deletions   Show diff stats
app/controllers/my_profile/followers_controller.rb
  Diff comments   View file @e78974a
... ... @@ -24,7 +24,7 @@ class FollowersController < MyProfileController
24 24 def update_category
25 25 followed_profile = Profile.find_by(:id => params["followed_profile_id"])
26 26  
27   - selected_circles = params[:circles].map{|circle_name, circle_id| Circle.find_by(:id => circle_id)}.select{|c|not c.nil?}
  27 + selected_circles = params[:circles].map{ |circle_name, circle_id| Circle.find_by(:id => circle_id) }.select{ |c| c.present? }
28 28  
29 29 if followed_profile
30 30 current_person.update_profile_circles(followed_profile, selected_circles)
... ...
app/controllers/public/profile_controller.rb
  Diff comments   View file @e78974a
... ... @@ -163,7 +163,7 @@ class ProfileController < PublicController
163 163 def follow
164 164 if request.post?
165 165 if profile.followed_by?(current_person)
166   - render :text => _("You are already following %s.") % profile.name, :status => 400
  166 + render :text => _("You are already following %s.") % profile.name, :status => 400
167 167 else
168 168 selected_circles = params[:circles].map{|circle_name, circle_id| Circle.find_by(:id => circle_id)}.select{|c|not c.nil?}
169 169 if selected_circles.present?
... ... @@ -179,8 +179,8 @@ class ProfileController < PublicController
179 179 end
180 180  
181 181 def find_profile_circles
182   - circles = Circle.where(:person => current_person, :profile_type => profile.class.name)
183   - render :partial => 'blocks/profile_info_actions/circles', :locals => { :circles => circles, :profile_types => Circle.profile_types.to_a }
  182 + circles = Circle.where(:person => current_person, :profile_type => profile.class.name)
  183 + render :partial => 'blocks/profile_info_actions/circles', :locals => { :circles => circles, :profile_types => Circle.profile_types.to_a }
184 184 end
185 185  
186 186 def unfollow
... ...
app/models/person.rb
  Diff comments   View file @e78974a
... ... @@ -200,14 +200,14 @@ class Person < Profile
200 200 end
201 201 end
202 202  
203   - def follow (profile, circles)
  203 + def follow(profile, circles)
204 204 circles = [circles] unless circles.is_a?(Array)
205 205 circles.each do |new_circle|
206 206 ProfileFollower.create(profile: profile, circle: new_circle)
207 207 end
208 208 end
209 209  
210   - def update_profile_circles (profile, new_circles)
  210 + def update_profile_circles(profile, new_circles)
211 211 profile_circles = ProfileFollower.with_profile(profile).with_follower(self).map(&:circle)
212 212 circles_to_add = new_circles - profile_circles
213 213 circles_to_remove = profile_circles - new_circles
... ...
app/views/followers/index.html.erb
  Diff comments   View file @e78974a
1 1 <div id="manage_followed people">
2 2  
3   -<h1><%= _("%s following") % profile.name %></h1>
  3 +<h1><%= _("%s is following") % profile.name %></h1>
4 4  
5 5 <% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
6 6 <% if @followed_people.empty? %>
... ...