tests passing

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 454912b0ee65a75fa4d5619902ef611c8447b0a7..bd2e4514367916204e113b99d3343da0ba0df6be 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -26,7 +26,7 @@ class DiaryEntryController < ApplicationController
         end
 
         # Subscribe user to diary comments
-        @diary_entry.subscribers << @user
+        @diary_entry.subscriptions.create(user: @user)
 
         redirect_to :controller => "diary_entry", :action => "list", :display_name => @user.display_name
       else
@@ -70,7 +70,7 @@ class DiaryEntryController < ApplicationController
       end
 
       # Add the commenter to the subscribers if necessary
-      @entry.subscribers << @user unless @entry.subscribers.exists?(@user.id)
+      @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
@@ -81,21 +81,23 @@ class DiaryEntryController < ApplicationController
   end
 
   def subscribe
-    @entry = DiaryEntry.find(params[:id])
+    diary_entry = DiaryEntry.find(params[:id])
 
-    if ! diary_entry.subscribers.exists?(@user.id)
-      diary_entry.subscribers << @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
+    render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe
-    @entry = DiaryEntry.find(params[:id])
+    diary_entry = DiaryEntry.find(params[:id])
 
-    if diary_entry.subscribers.exists?(@user.id)
-      diary_entry.subscribers.delete(@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
+    render :action => "no_such_entry", :status => :not_found
   end
 
   def list