cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve selection logic in DiaryEntry#rss

Browse source
This commit is contained in:
Tom Hughes 2013-03-23 17:35:10 +00:00
parent abd29001a3
commit 9d23b0d00c
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/controllers/diary_entry_controller.rb
View file

@ -141,30 +141,33 @@ class DiaryEntryController < ApplicationController
end end
def rss def rss
@entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20)
if params[:display_name] if params[:display_name]
user = User.active.find_by_display_name(params[:display_name]) user = User.active.find_by_display_name(params[:display_name])
if user if user
@entries = user.diary_entries.visible @entries = user.diary_entries
@title = I18n.t('diary_entry.feed.user.title', :user => user.display_name) @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name)
@description = I18n.t('diary_entry.feed.user.description', :user => user.display_name) @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
@link = "http://#{SERVER_URL}/user/#{user.display_name}/diary" @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
else else
render :nothing => true, :status => :not_found render :nothing => true, :status => :not_found
end end
elsif params[:language]
@entries = @entries.visible.where(:language_code => params[:language]).joins(:user).where(:users => { :status => ["active", "confirmed"] })
@title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name)
@description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
@link = "http://#{SERVER_URL}/diary/#{params[:language]}"
else else
@entries = @entries.visible.joins(:user).where(:users => { :status => ["active", "confirmed"] }) @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
@title = I18n.t('diary_entry.feed.all.title')
@description = I18n.t('diary_entry.feed.all.description') if params[:language]
@link = "http://#{SERVER_URL}/diary" @entries = @entries.where(:language_code => params[:language])
@title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name)
@description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
@link = "http://#{SERVER_URL}/diary/#{params[:language]}"
else
@title = I18n.t('diary_entry.feed.all.title')
@description = I18n.t('diary_entry.feed.all.description')
@link = "http://#{SERVER_URL}/diary"
end
end end
@entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
end end
def view def view