Fix database offline mode

[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 4a1da178a163b558f1775a18b99527ab7519f196..fb1e7b702a6aa92250f24eb914be3633c4ca4cfc 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -3,11 +3,11 @@ class DiaryEntriesController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

+  before_action :check_database_readable

 
   authorize_resource
 
   before_action :lookup_user, :only => [:show, :comments]
 
   authorize_resource
 
   before_action :lookup_user, :only => [:show, :comments]

-  before_action :check_database_readable

   before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
   before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]
 
   before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
   before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]
 


@@ -158,7 +158,7 @@ class DiaryEntriesController < ApplicationController
         @entries = user.diary_entries
         @title = t("diary_entries.feed.user.title", :user => user.display_name)
         @description = t("diary_entries.feed.user.description", :user => user.display_name)
         @entries = user.diary_entries
         @title = t("diary_entries.feed.user.title", :user => user.display_name)
         @description = t("diary_entries.feed.user.description", :user => user.display_name)

-        @link = url_for :action => "index", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+        @link = url_for :action => "index", :display_name => user.display_name, :host => Settings.server_url, :protocol => Settings.server_protocol

       else
         head :not_found
         return
       else
         head :not_found
         return


@@ -170,11 +170,11 @@ class DiaryEntriesController < ApplicationController
         @entries = @entries.where(:language_code => params[:language])
         @title = t("diary_entries.feed.language.title", :language_name => Language.find(params[:language]).english_name)
         @description = t("diary_entries.feed.language.description", :language_name => Language.find(params[:language]).english_name)
         @entries = @entries.where(:language_code => params[:language])
         @title = t("diary_entries.feed.language.title", :language_name => Language.find(params[:language]).english_name)
         @description = t("diary_entries.feed.language.description", :language_name => Language.find(params[:language]).english_name)

-        @link = url_for :action => "index", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+        @link = url_for :action => "index", :language => params[:language], :host => Settings.server_url, :protocol => Settings.server_protocol

       else
         @title = t("diary_entries.feed.all.title")
         @description = t("diary_entries.feed.all.description")
       else
         @title = t("diary_entries.feed.all.title")
         @description = t("diary_entries.feed.all.description")

-        @link = url_for :action => "index", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+        @link = url_for :action => "index", :host => Settings.server_url, :protocol => Settings.server_protocol

       end
     end
 
       end
     end