Close button for loading error alert

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

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index ff6dfc826cbf67763889a8c9c490b87558a58c45..94876e72a38b539bf2b21240cfa041f79f6a51c3 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -28,8 +28,8 @@ class DiaryEntriesController < ApplicationController
       end
     elsif params[:friends]
       if current_user
       end
     elsif params[:friends]
       if current_user

-        @title = t ".title_friends"
-        entries = DiaryEntry.where(:user => current_user.friends)
+        @title = t ".title_followed"
+        entries = DiaryEntry.where(:user => current_user.followings)

       else
         require_user
         return
       else
         require_user
         return


@@ -71,6 +71,7 @@ class DiaryEntriesController < ApplicationController
     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
       @opengraph_properties = {
     if @entry
       @title = t ".title", :user => params[:display_name], :title => @entry.title
       @opengraph_properties = {

+        "og:title" => @entry.title,

         "og:image" => @entry.body.image,
         "og:image:alt" => @entry.body.image_alt,
         "og:description" => @entry.body.description,
         "og:image" => @entry.body.image,
         "og:image:alt" => @entry.body.image_alt,
         "og:description" => @entry.body.description,


@@ -122,7 +123,7 @@ class DiaryEntriesController < ApplicationController
       # Subscribe user to diary comments
       @diary_entry.subscriptions.create(:user => current_user)
 
       # Subscribe user to diary comments
       @diary_entry.subscriptions.create(:user => current_user)
 

-      redirect_to :action => "index", :display_name => current_user.display_name
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)

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