Show blocked api response when reopening notes
This commit is contained in:
parent
3ea2c30c58
commit
d1b58fb20e
3 changed files with 25 additions and 1 deletions
|
@ -83,7 +83,7 @@ OSM.Note = function (map) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateButtons(form) {
|
function updateButtons(form) {
|
||||||
$(form.close).prop("disabled", false);
|
$(form).find("input[type=submit]").prop("disabled", false);
|
||||||
if ($(form.text).val() === "") {
|
if ($(form.text).val() === "") {
|
||||||
$(form.close).val($(form.close).data("defaultActionText"));
|
$(form.close).val($(form.close).data("defaultActionText"));
|
||||||
$(form.comment).prop("disabled", true);
|
$(form.comment).prop("disabled", true);
|
||||||
|
|
|
@ -75,6 +75,8 @@
|
||||||
<% else %>
|
<% else %>
|
||||||
<form class="mb-3" action="#">
|
<form class="mb-3" action="#">
|
||||||
<input type="hidden" name="text" value="" autocomplete="off">
|
<input type="hidden" name="text" value="" autocomplete="off">
|
||||||
|
<div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
|
||||||
|
</div>
|
||||||
<div class="btn-wrapper">
|
<div class="btn-wrapper">
|
||||||
<% if @note.status != "hidden" and current_user and current_user.moderator? -%>
|
<% if @note.status != "hidden" and current_user and current_user.moderator? -%>
|
||||||
<input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
|
<input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
|
||||||
|
|
|
@ -103,4 +103,26 @@ class NoteCommentsTest < ApplicationSystemTestCase
|
||||||
assert_button "Comment", :disabled => true
|
assert_button "Comment", :disabled => true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "can't reactivate a note when blocked" do
|
||||||
|
note = create(:note_with_comments, :closed)
|
||||||
|
user = create(:user)
|
||||||
|
sign_in_as(user)
|
||||||
|
visit note_path(note)
|
||||||
|
create(:user_block, :user => user)
|
||||||
|
|
||||||
|
within_sidebar do
|
||||||
|
assert_no_text "Unresolved note"
|
||||||
|
assert_text "Resolved note"
|
||||||
|
assert_no_text "Your access to the API has been blocked"
|
||||||
|
assert_button "Reactivate", :disabled => false
|
||||||
|
|
||||||
|
click_on "Reactivate"
|
||||||
|
|
||||||
|
assert_no_text "Unresolved note"
|
||||||
|
assert_text "Resolved note"
|
||||||
|
assert_text "Your access to the API has been blocked"
|
||||||
|
assert_button "Reactivate", :disabled => false
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue