X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6982903ae791702453bfa3f3a1cb9bfcf342fa2d..6eac50525bd8df7a096a82d6a9de2d95893b397b:/app/controllers/diary_entries_controller.rb?ds=sidebyside diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index 6981ed797..dcb625d83 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -1,4 +1,6 @@ class DiaryEntriesController < ApplicationController + include UserMethods + layout "site", :except => :rss before_action :authorize_web @@ -25,7 +27,7 @@ class DiaryEntriesController < ApplicationController elsif params[:friends] if current_user @title = t ".title_friends" - entries = DiaryEntry.where(:user_id => current_user.friends) + entries = DiaryEntry.where(:user => current_user.friends) else require_user return @@ -33,7 +35,7 @@ class DiaryEntriesController < ApplicationController elsif params[:nearby] if current_user @title = t ".title_nearby" - entries = DiaryEntry.where(:user_id => current_user.nearby) + entries = DiaryEntry.where(:user => current_user.nearby) else require_user return