X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f0feca800d91ac1d23eb63ca17a45d8fd4d41920..34e3e51456774127d43408b7ab65c24f41373f62:/app/controllers/diary_entry_controller.rb diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 6b8acbe71..a611c19e9 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -58,7 +58,7 @@ class DiaryEntryController < ApplicationController @diary_comment.user = @user if @diary_comment.save if @diary_comment.user != @entry.user - Notifier.diary_comment_notification(@diary_comment).deliver + Notifier.diary_comment_notification(@diary_comment).deliver_now end redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id @@ -98,7 +98,7 @@ class DiaryEntryController < ApplicationController end else @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] }) - + if params[:language] @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name @entries = @entries.where(:language_code => params[:language]) @@ -199,7 +199,7 @@ private def require_administrator unless @user.administrator? flash[:error] = t('user.filter.not_an_administrator') - redirect_to :controller => 'diary_entry', :action => 'view', :display_name => params[:id] + redirect_to :controller => 'diary_entry', :action => 'view' end end