cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/4871'

Browse source
This commit is contained in:
Tom Hughes 2024-06-04 10:38:20 +01:00
commit 691289bfc0
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/index/note.js
View file

@ -36,12 +36,12 @@ OSM.Note = function (map) {
}; };
function initialize(path, id, callback) { function initialize(path, id, callback) {
content.find("input[type=submit]").on("click", function (e) { content.find("button[type=submit]").on("click", function (e) {
e.preventDefault(); e.preventDefault();
var data = $(e.target).data(); var data = $(e.target).data();
var form = e.target.form; var form = e.target.form;
$(form).find("input[type=submit]").prop("disabled", true); $(form).find("button[type=submit]").prop("disabled", true);
$.ajax({ $.ajax({
url: data.url, url: data.url,
@ -83,12 +83,12 @@ OSM.Note = function (map) {
} }
function updateButtons(form) { function updateButtons(form) {
$(form).find("input[type=submit]").prop("disabled", false); $(form).find("button[type=submit]").prop("disabled", false);
if ($(form.text).val() === "") { if ($(form.text).val() === "") {
$(form.close).val($(form.close).data("defaultActionText")); $(form.close).text($(form.close).data("defaultActionText"));
$(form.comment).prop("disabled", true); $(form.comment).prop("disabled", true);
} else { } else {
$(form.close).val($(form.close).data("commentActionText")); $(form.close).text($(form.close).data("commentActionText"));
$(form.comment).prop("disabled", false); $(form.comment).prop("disabled", false);
} }
} }

10
app/views/notes/show.html.erb
View file

@ -53,16 +53,16 @@
</div> </div>
<div class="d-flex flex-wrap gap-1"> <div class="d-flex flex-wrap gap-1">
<% if current_user.moderator? -%> <% if current_user.moderator? -%>
<%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light", <%= button_tag t(".hide"), :name => "hide", :class => "btn btn-light",
:data => { :method => "DELETE", :data => { :method => "DELETE",
:url => api_note_url(@note, "json") } %> :url => api_note_url(@note, "json") } %>
<% end -%> <% end -%>
<%= submit_tag t(".resolve"), :name => "close", :class => "btn btn-primary", <%= button_tag t(".resolve"), :name => "close", :class => "btn btn-primary",
:data => { :method => "POST", :data => { :method => "POST",
:url => close_api_note_url(@note, "json"), :url => close_api_note_url(@note, "json"),
:default_action_text => t(".resolve"), :default_action_text => t(".resolve"),
:comment_action_text => t(".comment_and_resolve") } %> :comment_action_text => t(".comment_and_resolve") } %>
<%= submit_tag t(".comment"), :name => "comment", :class => "btn btn-primary", :disabled => true, <%= button_tag t(".comment"), :name => "comment", :class => "btn btn-primary", :disabled => true,
:data => { :method => "POST", :data => { :method => "POST",
:url => comment_api_note_url(@note, "json") } %> :url => comment_api_note_url(@note, "json") } %>
</div> </div>
@ -79,12 +79,12 @@
</div> </div>
<div class="d-flex flex-wrap gap-1"> <div class="d-flex flex-wrap gap-1">
<% if @note.status != "hidden" and current_user and current_user.moderator? -%> <% if @note.status != "hidden" and current_user and current_user.moderator? -%>
<%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light", <%= button_tag t(".hide"), :name => "hide", :class => "btn btn-light",
:data => { :method => "DELETE", :data => { :method => "DELETE",
:url => api_note_url(@note, "json") } %> :url => api_note_url(@note, "json") } %>
<% end -%> <% end -%>
<% if current_user -%> <% if current_user -%>
<%= submit_tag t(".reactivate"), :name => "reopen", :class => "btn btn-primary", <%= button_tag t(".reactivate"), :name => "reopen", :class => "btn btn-primary",
:data => { :method => "POST", :data => { :method => "POST",
:url => reopen_api_note_url(@note, "json") } %> :url => reopen_api_note_url(@note, "json") } %>
<% end -%> <% end -%>