fix the build

This commit is contained in:
Régis Hanol 2018-05-26 03:11:10 +02:00
parent 338d39265a
commit 5b2e7c8d10
3 changed files with 7 additions and 10 deletions

View File

@ -254,6 +254,8 @@ class ApplicationController < ActionController::Base
if notifications.present?
notification_ids = notifications.split(",").map(&:to_i)
Notification.read(current_user, notification_ids)
current_user.reload
current_user.publish_notifications_state
cookies.delete('cn')
end
end

View File

@ -59,10 +59,11 @@ class NotificationsController < ApplicationController
else
Notification.where(user_id: current_user.id).includes(:topic).where(read: false).update_all(read: true)
current_user.saw_notification_id(Notification.recent_report(current_user, 1).max.try(:id))
current_user.reload
current_user.publish_notifications_state
end
current_user.reload
current_user.publish_notifications_state
render json: success_json
end

View File

@ -58,26 +58,20 @@ class Notification < ActiveRecord::Base
end
def self.mark_posts_read(user, topic_id, post_numbers)
count = Notification
Notification
.where(user_id: user.id)
.where(topic_id: topic_id)
.where(post_number: post_numbers)
.where(read: false)
.update_all(read: true)
refresh_notification_count if count > 0
count
end
def self.read(user, notification_ids)
count = Notification
Notification
.where(id: notification_ids)
.where(user_id: user.id)
.where(read: false)
.update_all(read: true)
refresh_notification_count if count > 0
end
def self.interesting_after(min_date)