Merge pull request #2556 from basecamp/fix-notifications-staying-unread-on-card-visit
Reinstate card readings
This commit is contained in:
@@ -2,12 +2,12 @@ class Cards::ReadingsController < ApplicationController
|
||||
include CardScoped
|
||||
|
||||
def create
|
||||
@card.read_by(Current.user)
|
||||
@notification = @card.read_by(Current.user)
|
||||
record_board_access
|
||||
end
|
||||
|
||||
def destroy
|
||||
@card.unread_by(Current.user)
|
||||
@notification = @card.unread_by(Current.user)
|
||||
record_board_access
|
||||
end
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@ module Card::Readable
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def read_by(user)
|
||||
user.notifications.find_by(card: self)&.read
|
||||
user.notifications.find_by(card: self)&.tap(&:read)
|
||||
end
|
||||
|
||||
def unread_by(user)
|
||||
user.notifications.find_by(card: self)&.unread
|
||||
user.notifications.find_by(card: self)&.tap(&:unread)
|
||||
end
|
||||
|
||||
def remove_inaccessible_notifications
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
<%= turbo_stream.remove @notification if @notification %>
|
||||
Reference in New Issue
Block a user