diff --git a/app/jobs/notify_activity_to_profiles_job.rb b/app/jobs/notify_activity_to_profiles_job.rb index 0fabd89..cae3624 100644 --- a/app/jobs/notify_activity_to_profiles_job.rb +++ b/app/jobs/notify_activity_to_profiles_job.rb @@ -23,7 +23,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id) #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})") # Notify all followers - 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})") + 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}))") if tracked_action.user.is_a? Organization ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " + diff --git a/public/stylesheets/profile-activity.scss b/public/stylesheets/profile-activity.scss index 91848a1..6163fe1 100644 --- a/public/stylesheets/profile-activity.scss +++ b/public/stylesheets/profile-activity.scss @@ -167,7 +167,9 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { #profile-wall li.profile-activity-item.join_community .profile-activity-text a img, #profile-wall li.profile-activity-item.new_friendship .profile-activity-text a img, +#profile-wall li.profile-activity-item.new_follower .profile-activity-text a img, #profile-network li.profile-activity-item.join_community .profile-activity-text a img, +#profile-network li.profile-activity-item.new_follower .profile-activity-text a img, #profile-network li.profile-activity-item.new_friendship .profile-activity-text a img { margin: 5px 5px 0 0; padding: 1px; -- libgit2 0.21.2