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

tests passing

Browse source
This commit is contained in:
Mikel Maron 2016-10-06 21:33:47 -04:00
parent 3c01d2e80d
commit e055eaf690
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/diary_entry_controller.rb
View file

@ -70,7 +70,7 @@ class DiaryEntryController < ApplicationController
end
# Add the commenter to the subscribers if necessary
@entry.subscriptions.create(user: @user) unless @entry.subscribers.exists?(@user)
@entry.subscriptions.create(user: @user) unless @entry.subscribers.exists?(@user.id)
redirect_to :controller => "diary_entry", :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
else
@ -83,7 +83,7 @@ class DiaryEntryController < ApplicationController
def subscribe
diary_entry = DiaryEntry.find(params[:id])
diary_entry.subscriptions.create(user: @user) unless diary_entry.subscribers.exists?(@user)
diary_entry.subscriptions.create(user: @user) unless diary_entry.subscribers.exists?(@user.id)
redirect_to :controller => "diary_entry", :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
rescue ActiveRecord::RecordNotFound
@ -93,7 +93,7 @@ class DiaryEntryController < ApplicationController
def unsubscribe
diary_entry = DiaryEntry.find(params[:id])
diary_entry.subscriptions.where(user: @user).delete_all if diary_entry.subscribers.exists?(@user)
diary_entry.subscriptions.where(user: @user).delete_all if diary_entry.subscribers.exists?(@user.id)
redirect_to :controller => "diary_entry", :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
rescue ActiveRecord::RecordNotFound