Download as
Browse Code »

Commit 206f864c0264b65990d7cd757e7df52163878eb4

Authored by Marcos Pereira
1 parent 279fbd19
Exists in federation_followers_backend

Fixes method name, add css rule 

Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com>
Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
app/jobs/notify_activity_to_profiles_job.rb
  Diff comments   View file @206f864
@@ -23,7 +23,7 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id) @@ -23,7 +23,7 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
23 #ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select f.friend_id, #{tracked_action.id} from friendships as f where person_id=#{tracked_action.user.id} and f.friend_id not in (select atn.profile_id from action_tracker_notifications as atn where atn.action_tracker_id = #{tracked_action.id})") 23 #ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select f.friend_id, #{tracked_action.id} from friendships as f where person_id=#{tracked_action.user.id} and f.friend_id not in (select atn.profile_id from action_tracker_notifications as atn where atn.action_tracker_id = #{tracked_action.id})")
24 24
25 # Notify all followers 25 # Notify all followers
26 - ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT f.follower_id, #{tracked_action.id} FROM profile_followers AS f WHERE profile_id=#{tracked_action.user.id} AND (f.follower_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id})) AND (f.follower_id IN SELECT friendships.friend_id FROM friendships WHERE friendships.person_id = #{tracked_action.user.id} OR SELECT profiles.public FROM profiles where id=#{tracked_action.user.id})") 26 + ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT f.follower_id, #{tracked_action.id} FROM profile_followers AS f WHERE profile_id=#{tracked_action.user.id} AND (f.follower_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
27 27
28 if tracked_action.user.is_a? Organization 28 if tracked_action.user.is_a? Organization
29 ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " + 29 ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " +
public/stylesheets/profile-activity.scss
  Diff comments   View file @206f864
@@ -167,7 +167,9 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -167,7 +167,9 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
167 167
168 #profile-wall li.profile-activity-item.join_community .profile-activity-text a img, 168 #profile-wall li.profile-activity-item.join_community .profile-activity-text a img,
169 #profile-wall li.profile-activity-item.new_friendship .profile-activity-text a img, 169 #profile-wall li.profile-activity-item.new_friendship .profile-activity-text a img,
  170 +#profile-wall li.profile-activity-item.new_follower .profile-activity-text a img,
170 #profile-network li.profile-activity-item.join_community .profile-activity-text a img, 171 #profile-network li.profile-activity-item.join_community .profile-activity-text a img,
  172 +#profile-network li.profile-activity-item.new_follower .profile-activity-text a img,
171 #profile-network li.profile-activity-item.new_friendship .profile-activity-text a img { 173 #profile-network li.profile-activity-item.new_friendship .profile-activity-text a img {
172 margin: 5px 5px 0 0; 174 margin: 5px 5px 0 0;
173 padding: 1px; 175 padding: 1px;