Align bottoms of date-username-changeset_id and counters in history

[rails.git] / app / controllers / api / changesets_controller.rb

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 517cff47326d28853cacd96416c718c8b5d81b69..e335f88f0653bc31042c7f6d37ee157bf2083623 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -63,7 +63,7 @@ module Api
       @changeset = Changeset.find(params[:id])
       if params[:include_discussion].presence
         @comments = @changeset.comments
-        @comments = @comments.unscope(:where => :visible) if params[:show_hidden_comments].presence && can?(:restore, ChangesetComment)
+        @comments = @comments.unscope(:where => :visible) if params[:show_hidden_comments].presence && can?(:create, :changeset_comment_visibility)
         @comments = @comments.includes(:author)
       end
 
@@ -82,7 +82,7 @@ module Api
       cs.save_with_tags!
 
       # Subscribe user to changeset comments
-      cs.subscribe(current_user)
+      cs.subscribers << current_user
 
       render :plain => cs.id.to_s
     end
@@ -163,10 +163,10 @@ module Api
 
       # Find the changeset and check it is valid
       changeset = Changeset.find(id)
-      raise OSM::APIChangesetAlreadySubscribedError, changeset if changeset.subscribed?(current_user)
+      raise OSM::APIChangesetAlreadySubscribedError, changeset if changeset.subscribers.include?(current_user)
 
       # Add the subscriber
-      changeset.subscribe(current_user)
+      changeset.subscribers << current_user
 
       # Return a copy of the updated changeset
       @changeset = changeset
@@ -189,10 +189,10 @@ module Api
 
       # Find the changeset and check it is valid
       changeset = Changeset.find(id)
-      raise OSM::APIChangesetNotSubscribedError, changeset unless changeset.subscribed?(current_user)
+      raise OSM::APIChangesetNotSubscribedError, changeset unless changeset.subscribers.include?(current_user)
 
       # Remove the subscriber
-      changeset.unsubscribe(current_user)
+      changeset.subscribers.delete(current_user)
 
       # Return a copy of the updated changeset
       @changeset = changeset