]> git.openstreetmap.org Git - rails.git/commitdiff
Allow moderators to reopen hidden notes
authorTom Hughes <tom@compton.nu>
Thu, 28 Nov 2013 20:25:36 +0000 (20:25 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Nov 2013 20:25:36 +0000 (20:25 +0000)
app/controllers/notes_controller.rb

index a297748bdd69ae6a34d982669ef8c16fe4633088..333597a722724835662c9fd4156946291a4791ed 100644 (file)
@@ -155,8 +155,8 @@ class NotesController < ApplicationController
     # Find the note and check it is valid
     @note = Note.find_by_id(id)
     raise OSM::APINotFoundError unless @note
-    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
-    raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed?
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? or @user.moderator?
+    raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? or not @note.visible?
 
     # Reopen the note and add a comment
     Note.transaction do