not api endpoints, moved to button, fixed notifier message, fixed tests

[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..07980adc8101789927b22c0ded2122ef3368bbce 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -81,21 +81,27 @@ class DiaryEntryController < ApplicationController
   end
 
   def subscribe
   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
 
     if ! diary_entry.subscribers.exists?(@user.id)
       diary_entry.subscribers << @user

+    end

 
     redirect_to :controller => "diary_entry", :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.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
   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)
 
     if diary_entry.subscribers.exists?(@user.id)
       diary_entry.subscribers.delete(@user)

+    end

 
     redirect_to :controller => "diary_entry", :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.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
   end
 
   def list