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

Fix being able to delete notes when post is note locked

Browse Source
This commit is contained in:
Toks
2015-10-27 09:49:15 -04:00
parent 3a81f1ee8e
commit 010008eab3
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/notes.js
View File

@@ -523,13 +523,15 @@ Danbooru.Note = {
var $this = $(this); var $this = $(this);
var id = $this.data("id"); var id = $this.data("id");
Danbooru.Note.Box.find(id).remove();
Danbooru.Note.Body.find(id).remove();
$this.dialog("close");
if (id.match(/\d/)) { if (id.match(/\d/)) {
$.ajax("/notes/" + id + ".js", { $.ajax("/notes/" + id + ".json", {
type: "DELETE" type: "DELETE",
success: function() {
Danbooru.Note.Box.find(id).remove();
Danbooru.Note.Body.find(id).remove();
$this.dialog("close");
}
}); });
} }
}, },

2
app/controllers/notes_controller.rb
View File

@@ -48,7 +48,7 @@ class NotesController < ApplicationController
def destroy def destroy
@note = Note.find(params[:id]) @note = Note.find(params[:id])
@note.update_attribute(:is_active, false) @note.update_attributes(:is_active => false)
respond_with(@note) respond_with(@note)
end end