before_filter :check_database_writable, :only => [:new, :edit]
before_filter :require_administrator, :only => [:hide, :hidecomment]
+ caches_action :list, :layout => false, :unless => :user_specific_list?
+ caches_action :rss, :layout => true
+ caches_action :view, :layout => false
+ cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment]
+
def new
@title = t 'diary_entry.new.title'
@diary_entry.user = @user
if @diary_entry.save
- default_lang = @user.preferences.find(:first, :conditions => {:k => "diary.default_language"})
+ default_lang = @user.preferences.where(:k => "diary.default_language").first
if default_lang
default_lang.v = @diary_entry.language_code
default_lang.save!
render :action => 'edit'
end
else
- default_lang = @user.preferences.find(:first, :conditions => {:k => "diary.default_language"})
+ default_lang = @user.preferences.where(:k => "diary.default_language").first
lang_code = default_lang ? default_lang.v : @user.preferred_language
@diary_entry = DiaryEntry.new(:language_code => lang_code)
render :action => 'edit'
@diary_comment.user = @user
if @diary_comment.save
if @diary_comment.user != @entry.user
- Notifier::deliver_diary_comment_notification(@diary_comment)
+ Notifier.diary_comment_notification(@diary_comment).deliver
end
redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
def list
if params[:display_name]
- @this_user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
+ @this_user = User.active.find_by_display_name(params[:display_name])
if @this_user
@title = t 'diary_entry.list.user_title', :user => @this_user.display_name
@title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
:conditions => {
- :users => { :visible => true },
+ :users => { :status => ["active", "confirmed"] },
:visible => true,
:language_code => params[:language]
},
:order => 'created_at DESC',
:per_page => 20)
+ elsif params[:friends]
+ if @user
+ @title = t 'diary_entry.list.title_friends'
+ @entry_pages, @entries = paginate(:diary_entries, :include => :user,
+ :conditions => {
+ :user_id => @user.friend_users,
+ :visible => true
+ },
+ :order => 'created_at DESC',
+ :per_page => 20)
+ else
+ require_user
+ return
+ end
+ elsif params[:nearby]
+ if @user
+ @title = t 'diary_entry.list.title_nearby'
+ @entry_pages, @entries = paginate(:diary_entries, :include => :user,
+ :conditions => {
+ :user_id => @user.nearby,
+ :visible => true
+ },
+ :order => 'created_at DESC',
+ :per_page => 20)
+ else
+ require_user
+ return
+ end
else
@title = t 'diary_entry.list.title'
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
:conditions => {
- :users => { :visible => true },
+ :users => { :status => ["active", "confirmed"] },
:visible => true
},
:order => 'created_at DESC',
end
def rss
- request.format = :rss
+ @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20)
if params[:display_name]
- user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
+ user = User.active.find_by_display_name(params[:display_name])
if user
- @entries = DiaryEntry.find(:all,
- :conditions => {
- :user_id => user.id,
- :visible => true
- },
- :order => 'created_at DESC',
- :limit => 20)
+ @entries = user.diary_entries.visible
@title = I18n.t('diary_entry.feed.user.title', :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"
render :nothing => true, :status => :not_found
end
elsif params[:language]
- @entries = DiaryEntry.find(:all, :include => :user,
- :conditions => {
- :users => { :visible => true },
- :visible => true,
- :language_code => params[:language]
- },
- :order => 'created_at DESC',
- :limit => 20)
+ @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
- @entries = DiaryEntry.find(:all, :include => :user,
- :conditions => {
- :users => { :visible => true },
- :visible => true
- },
- :order => 'created_at DESC',
- :limit => 20)
+ @entries = @entries.visible.joins(:user).where(:users => { :status => ["active", "confirmed"] })
@title = I18n.t('diary_entry.feed.all.title')
@description = I18n.t('diary_entry.feed.all.description')
@link = "http://#{SERVER_URL}/diary"
end
def view
- user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
+ user = User.active.find_by_display_name(params[:display_name])
if user
- @entry = DiaryEntry.find(:first, :conditions => {
- :id => params[:id],
- :user_id => user.id,
- :visible => true
- })
+ @entry = user.diary_entries.visible.where(:id => params[:id]).first
if @entry
- @title = t 'diary_entry.view.title', :user => params[:display_name]
+ @title = t 'diary_entry.view.title', :user => params[:display_name], :title => @entry.title
else
@title = t 'diary_entry.no_such_entry.title', :id => params[:id]
render :action => 'no_such_entry', :status => :not_found
def hidecomment
comment = DiaryComment.find(params[:comment])
comment.update_attributes(:visible => false)
- redirect_to :action => "view", :id => comment.diary_entry.id
+ redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id
end
+
+ def comments
+ @this_user = User.active.find_by_display_name(params[:display_name])
+
+ if @this_user
+ @comment_pages, @comments = paginate(:diary_comments,
+ :conditions => { :user_id => @this_user },
+ :order => 'created_at DESC',
+ :per_page => 20)
+ @page = (params[:page] || 1).to_i
+ else
+ @title = t'diary_entry.no_such_user.title'
+ @not_found_user = params[:display_name]
+ render :action => 'no_such_user', :status => :not_found
+ end
+ end
private
##
# require that the user is a administrator, or fill out a helpful error message
redirect_to :controller => 'diary_entry', :action => 'view', :display_name => params[:id]
end
end
+
+ ##
+ # is this list user specific?
+ def user_specific_list?
+ params[:friends] or params[:nearby]
+ end
end
projects / rails.git / blobdiff