X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/84a3a41531cd283ddfe5a86de1a0656c8cdd2185..e2e61692ea04fc156221082aeddc21ea18facdec:/app/controllers/changeset_subscriptions_controller.rb diff --git a/app/controllers/changeset_subscriptions_controller.rb b/app/controllers/changeset_subscriptions_controller.rb index 6e0ad5257..00f5f4d20 100644 --- a/app/controllers/changeset_subscriptions_controller.rb +++ b/app/controllers/changeset_subscriptions_controller.rb @@ -5,13 +5,13 @@ class ChangesetSubscriptionsController < ApplicationController before_action :set_locale before_action :check_database_writable - authorize_resource :class => :changeset_subscription + authorize_resource around_action :web_timeout def show @changeset = Changeset.find(params[:changeset_id]) - @subscribed = @changeset.subscribed?(current_user) + @subscribed = @changeset.subscribers.include?(current_user) rescue ActiveRecord::RecordNotFound render :action => "no_such_entry", :status => :not_found end @@ -19,7 +19,7 @@ class ChangesetSubscriptionsController < ApplicationController def create @changeset = Changeset.find(params[:changeset_id]) - @changeset.subscribe(current_user) unless @changeset.subscribed?(current_user) + @changeset.subscribers << current_user unless @changeset.subscribers.include?(current_user) redirect_to changeset_path(@changeset) rescue ActiveRecord::RecordNotFound @@ -29,7 +29,7 @@ class ChangesetSubscriptionsController < ApplicationController def destroy @changeset = Changeset.find(params[:changeset_id]) - @changeset.unsubscribe(current_user) + @changeset.subscribers.delete(current_user) redirect_to changeset_path(@changeset) rescue ActiveRecord::RecordNotFound