merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

[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..bf9f2a9a24975ffaad3f40e6a9da1a880f40d940 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -26,9 +26,9 @@ class DiaryEntryController < ApplicationController
         end
 
         # Subscribe user to diary comments
         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
+        redirect_to :action => "list", :display_name => @user.display_name

       else
         render :action => "edit"
       end
       else
         render :action => "edit"
       end


@@ -46,9 +46,9 @@ class DiaryEntryController < ApplicationController
     @diary_entry = DiaryEntry.find(params[:id])
 
     if @user != @diary_entry.user
     @diary_entry = DiaryEntry.find(params[:id])
 
     if @user != @diary_entry.user

-      redirect_to :controller => "diary_entry", :action => "view", :id => params[:id]
+      redirect_to :action => "view", :id => params[:id]

     elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)
     elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)

-      redirect_to :controller => "diary_entry", :action => "view", :id => params[:id]
+      redirect_to :action => "view", :id => params[:id]

     end
 
     set_map_location
     end
 
     set_map_location


@@ -70,9 +70,9 @@ class DiaryEntryController < ApplicationController
       end
 
       # Add the commenter to the subscribers if necessary
       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
+      redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id

     else
       render :action => "view"
     end
     else
       render :action => "view"
     end


@@ -81,21 +81,23 @@ 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
+    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
+    redirect_to :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)
+    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
+    redirect_to :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


@@ -230,7 +232,7 @@ class DiaryEntryController < ApplicationController
   def require_administrator
     unless @user.administrator?
       flash[:error] = t("user.filter.not_an_administrator")
   def require_administrator
     unless @user.administrator?
       flash[:error] = t("user.filter.not_an_administrator")

-      redirect_to :controller => "diary_entry", :action => "view"
+      redirect_to :action => "view"

     end
   end
 
     end
   end