jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #4287: Hide Dmail notice persistently shown even after closing

Browse Source
This commit is contained in:
evazion
2020-02-05 20:41:55 -06:00
parent 960ed8934b
commit 094b9e6d07
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/_dmail_notice.html.erb
View File

@@ -1,4 +1,4 @@
<div class="notice notice-info notice-large" id="dmail-notice" data-id="<%= latest_unread_dmail(CurrentUser.user) %>"> <div class="notice notice-info notice-large" id="dmail-notice" data-id="<%= latest_unread_dmail(CurrentUser.user).id %>">
<h2>You have <%= link_to "unread mail", dmails_path(search: { folder: "received" }) %>.</h2> <h2>You have <%= link_to "unread mail", dmails_path(search: { folder: "received" }) %>.</h2>
<div><%= link_to "Close this", "#", id: "hide-dmail-notice" %></div> <div><%= link_to "Close this", "#", id: "hide-dmail-notice" %></div>
</div> </div>

9
test/functional/dmails_controller_test.rb
View File

@@ -194,6 +194,15 @@ class DmailsControllerTest < ActionDispatch::IntegrationTest
assert_select "#dmail-notice", 1 assert_select "#dmail-notice", 1
assert_select "#nav-my-account-link", text: "My Account (1)" assert_select "#nav-my-account-link", text: "My Account (1)"
end end
should "not show the unread dmail notice after closing it" do
cookies[:hide_dmail_notice] = @user.dmails.active.unread.first.id
get_auth posts_path, @user
assert_response :success
assert_select "#dmail-notice", 0
assert_select "#nav-my-account-link", text: "My Account (1)"
end
end end
end end
end end