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'
if params[:diary_entry]
- @diary_entry = DiaryEntry.new(params[:diary_entry])
+ @diary_entry = DiaryEntry.new(entry_params)
@diary_entry.user = @user
if @diary_entry.save
if @user != @diary_entry.user
redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
- elsif params[:diary_entry] and @diary_entry.update_attributes(params[:diary_entry])
+ elsif params[:diary_entry] and @diary_entry.update_attributes(entry_params)
redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
end
def comment
@entry = DiaryEntry.find(params[:id])
- @diary_comment = @entry.comments.build(params[:diary_comment])
+ @diary_comment = @entry.comments.build(comment_params)
@diary_comment.user = @user
if @diary_comment.save
if @diary_comment.user != @entry.user
else
render :action => 'view'
end
+ rescue ActiveRecord::RecordNotFound
+ render :action => "no_such_entry", :status => :not_found
end
def list
if @this_user
@title = t 'diary_entry.list.user_title', :user => @this_user.display_name
- @entry_pages, @entries = paginate(:diary_entries,
- :conditions => {
- :user_id => @this_user.id,
- :visible => true
- },
- :order => 'created_at DESC',
- :per_page => 20)
+ @entries = @this_user.diary_entries
else
render_unknown_user params[:display_name]
+ return
end
- elsif params[:language]
- @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 => { :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)
+ @entries = DiaryEntry.where(:user_id => @user.friend_users)
else
require_user
return
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)
+ @entries = DiaryEntry.where(:user_id => @user.nearby)
else
require_user
return
end
else
- @title = t 'diary_entry.list.title'
- @entry_pages, @entries = paginate(:diary_entries, :include => :user,
- :conditions => {
- :users => { :status => ["active", "confirmed"] },
- :visible => true
- },
- :order => 'created_at DESC',
- :per_page => 20)
+ @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])
+ else
+ @title = t 'diary_entry.list.title'
+ end
end
+
+ @page = (params[:page] || 1).to_i
+ @page_size = 20
+
+ @entries = @entries.visible
+ @entries = @entries.order("created_at DESC")
+ @entries = @entries.offset((@page - 1) * @page_size)
+ @entries = @entries.limit(@page_size)
+ @entries = @entries.includes(:user, :language)
end
def rss
- @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20)
-
if params[:display_name]
user = User.active.find_by_display_name(params[:display_name])
if user
- @entries = user.diary_entries.visible
+ @entries = user.diary_entries
@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"
else
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
+ return
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
- @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"
+ @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+
+ if params[:language]
+ @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
+
+ @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
end
def view
def hide
entry = DiaryEntry.find(params[:id])
- entry.update_attributes({:visible => false}, :without_protection => true)
+ entry.update_attributes(:visible => false)
redirect_to :action => "list", :display_name => entry.user.display_name
end
def hidecomment
comment = DiaryComment.find(params[:comment])
- comment.update_attributes({:visible => false}, :without_protection => true)
+ comment.update_attributes(:visible => false)
redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id
end
@page = (params[:page] || 1).to_i
end
private
+ ##
+ # return permitted diary entry parameters
+ def entry_params
+ params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)
+ end
+
+ ##
+ # return permitted diary comment parameters
+ def comment_params
+ params.require(:diary_comment).permit(:body)
+ end
+
##
# require that the user is a administrator, or fill out a helpful error message
# and return them to the user page.
projects / rails.git / blobdiff