before_action :authorize_web
before_action :set_locale
before_action :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
- before_action :lookup_this_user, :only => [:view, :comments]
+ before_action :lookup_user, :only => [:show, :comments]
before_action :check_database_readable
before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
before_action :require_administrator, :only => [:hide, :hidecomment]
+ before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]
def new
@title = t "diary_entry.new.title"
- if params[:diary_entry]
+ if request.post?
@diary_entry = DiaryEntry.new(entry_params)
- @diary_entry.user = @user
+ @diary_entry.user = current_user
if @diary_entry.save
- default_lang = @user.preferences.where(:k => "diary.default_language").first
+ default_lang = current_user.preferences.where(:k => "diary.default_language").first
if default_lang
default_lang.v = @diary_entry.language_code
default_lang.save!
else
- @user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
+ current_user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
end
# Subscribe user to diary comments
- @diary_entry.subscriptions.create(:user => @user)
+ @diary_entry.subscriptions.create(:user => current_user)
- redirect_to :action => "list", :display_name => @user.display_name
+ redirect_to :action => "index", :display_name => current_user.display_name
else
render :action => "edit"
end
else
- 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)
+ default_lang = current_user.preferences.where(:k => "diary.default_language").first
+ lang_code = default_lang ? default_lang.v : current_user.preferred_language
+ @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))
set_map_location
render :action => "edit"
end
@title = t "diary_entry.edit.title"
@diary_entry = DiaryEntry.find(params[:id])
- if @user != @diary_entry.user
- redirect_to :action => "view", :id => params[:id]
- elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)
- redirect_to :action => "view", :id => params[:id]
+ if current_user != @diary_entry.user
+ redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+ elsif params[:diary_entry] && @diary_entry.update(entry_params)
+ redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
end
set_map_location
def comment
@entry = DiaryEntry.find(params[:id])
@diary_comment = @entry.comments.build(comment_params)
- @diary_comment.user = @user
+ @diary_comment.user = current_user
if @diary_comment.save
# Notify current subscribers of the new comment
@entry.subscribers.visible.each do |user|
- if @user != user
- Notifier.diary_comment_notification(@diary_comment, user).deliver_now
- end
+ Notifier.diary_comment_notification(@diary_comment, user).deliver_now if current_user != user
end
# Add the commenter to the subscribers if necessary
- @entry.subscriptions.create(:user => @user) unless @entry.subscribers.exists?(@user.id)
+ @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)
- redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
+ redirect_to diary_entry_path(@entry.user, @entry)
else
- render :action => "view"
+ render :action => "show"
end
rescue ActiveRecord::RecordNotFound
render :action => "no_such_entry", :status => :not_found
def subscribe
diary_entry = DiaryEntry.find(params[:id])
- diary_entry.subscriptions.create(:user => @user) unless diary_entry.subscribers.exists?(@user.id)
+ diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)
- redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
+ redirect_to diary_entry_path(diary_entry.user, diary_entry)
rescue ActiveRecord::RecordNotFound
render :action => "no_such_entry", :status => :not_found
end
def unsubscribe
diary_entry = DiaryEntry.find(params[:id])
- diary_entry.subscriptions.where(:user => @user).delete_all if diary_entry.subscribers.exists?(@user.id)
+ diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)
- redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
+ redirect_to diary_entry_path(diary_entry.user, diary_entry)
rescue ActiveRecord::RecordNotFound
render :action => "no_such_entry", :status => :not_found
end
- def list
+ def index
if params[:display_name]
- @this_user = User.active.find_by_display_name(params[:display_name])
+ @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
- @entries = @this_user.diary_entries
+ if @user
+ @title = t "diary_entry.index.user_title", :user => @user.display_name
+ @entries = @user.diary_entries
else
render_unknown_user params[:display_name]
return
end
elsif params[:friends]
- if @user
- @title = t "diary_entry.list.title_friends"
- @entries = DiaryEntry.where(:user_id => @user.friend_users)
+ if current_user
+ @title = t "diary_entry.index.title_friends"
+ @entries = DiaryEntry.where(:user_id => current_user.friend_users)
else
require_user
return
end
elsif params[:nearby]
- if @user
- @title = t "diary_entry.list.title_nearby"
- @entries = DiaryEntry.where(:user_id => @user.nearby)
+ if current_user
+ @title = t "diary_entry.index.title_nearby"
+ @entries = DiaryEntry.where(:user_id => current_user.nearby)
else
require_user
return
end
else
- @entries = DiaryEntry.joins(:user).where(:users => { :status => %w(active confirmed) })
+ @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
if params[:language]
- @title = t "diary_entry.list.in_language_title", :language => Language.find(params[:language]).english_name
+ @title = t "diary_entry.index.in_language_title", :language => Language.find(params[:language]).english_name
@entries = @entries.where(:language_code => params[:language])
else
- @title = t "diary_entry.list.title"
+ @title = t "diary_entry.index.title"
end
end
+ @params = params.permit(:display_name, :friends, :nearby, :language)
+
@page = (params[:page] || 1).to_i
@page_size = 20
def rss
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
@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"
+ @title = t("diary_entry.feed.user.title", :user => user.display_name)
+ @description = t("diary_entry.feed.user.description", :user => user.display_name)
+ @link = url_for :controller => "diary_entry", :action => "index", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
else
- render :text => "", :status => :not_found
+ head :not_found
return
end
else
- @entries = DiaryEntry.joins(:user).where(:users => { :status => %w(active confirmed) })
+ @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[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]}"
+ @title = t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
+ @description = t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
+ @link = url_for :controller => "diary_entry", :action => "index", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
else
- @title = I18n.t("diary_entry.feed.all.title")
- @description = I18n.t("diary_entry.feed.all.description")
- @link = "http://#{SERVER_URL}/diary"
+ @title = t("diary_entry.feed.all.title")
+ @description = t("diary_entry.feed.all.description")
+ @link = url_for :controller => "diary_entry", :action => "index", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
end
end
@entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
end
- def view
- @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
+ def show
+ @entry = @user.diary_entries.visible.where(:id => params[:id]).first
if @entry
- @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title
+ @title = t "diary_entry.show.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 hide
entry = DiaryEntry.find(params[:id])
- entry.update_attributes(:visible => false)
- redirect_to :action => "list", :display_name => entry.user.display_name
+ entry.update(:visible => false)
+ redirect_to :action => "index", :display_name => entry.user.display_name
end
def hidecomment
comment = DiaryComment.find(params[:comment])
- comment.update_attributes(:visible => false)
- redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id
+ comment.update(:visible => false)
+ redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)
end
def comments
@comment_pages, @comments = paginate(:diary_comments,
:conditions => {
- :user_id => @this_user,
+ :user_id => @user,
:visible => true
},
:order => "created_at DESC",
# return permitted diary entry parameters
def entry_params
params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)
+ rescue ActionController::ParameterMissing
+ ActionController::Parameters.new.permit(:title, :body, :language_code, :latitude, :longitude)
end
##
# require that the user is a administrator, or fill out a helpful error message
# and return them to the user page.
def require_administrator
- unless @user.administrator?
+ unless current_user.administrator?
flash[:error] = t("user.filter.not_an_administrator")
- redirect_to :action => "view"
+ redirect_to :action => "show"
end
end
@lon = @diary_entry.longitude
@lat = @diary_entry.latitude
@zoom = 12
- elsif @user.home_lat.nil? || @user.home_lon.nil?
+ elsif current_user.home_lat.nil? || current_user.home_lon.nil?
@lon = params[:lon] || -0.1
@lat = params[:lat] || 51.5
@zoom = params[:zoom] || 4
else
- @lon = @user.home_lon
- @lat = @user.home_lat
+ @lon = current_user.home_lon
+ @lat = current_user.home_lat
@zoom = 12
end
end
projects / rails.git / blobdiff