else
@user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
end
- redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name
+ redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name
else
render :action => 'edit'
end
if @this_user
@title = t 'diary_entry.list.user_title', :user => @this_user.display_name
@entry_pages, @entries = paginate(:diary_entries,
- :conditions => {
+ :conditions => {
:user_id => @this_user.id,
- :visible => true
+ :visible => true
},
:order => 'created_at DESC',
:per_page => 20)
:per_page => 20)
else
require_user
- return
+ return
end
elsif params[:nearby]
if @user
:visible => true
},
:order => 'created_at DESC',
- :per_page => 20)
+ :per_page => 20)
else
require_user
- return
- end
+ return
+ end
else
@title = t 'diary_entry.list.title'
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
def comments
@comment_pages, @comments = paginate(:diary_comments,
- :conditions => {
+ :conditions => {
:user_id => @this_user,
:visible => true
},
:order => 'created_at DESC',
:per_page => 20)
@page = (params[:page] || 1).to_i
- end
+ end
private
##
# require that the user is a administrator, or fill out a helpful error message