This is already used by the oauth plugin, and is a general rails convention.
17 files changed:
def permissions
@permissions = if current_token.present?
ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }
def permissions
@permissions = if current_token.present?
ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }
ClientApplication.all_permissions
else
[]
ClientApplication.all_permissions
else
[]
def changeset
@type = "changeset"
@changeset = Changeset.find(params[:id])
def changeset
@type = "changeset"
@changeset = Changeset.find(params[:id])
- @comments = if @user && @user.moderator?
+ @comments = if current_user && current_user.moderator?
@changeset.comments.unscope(:where => :visible).includes(:author)
else
@changeset.comments.includes(:author)
@changeset.comments.unscope(:where => :visible).includes(:author)
else
@changeset.comments.includes(:author)
- if @user && @user.moderator?
+ if current_user && current_user.moderator?
@note = Note.find(params[:id])
@note_comments = @note.comments.unscope(:where => :visible)
else
@note = Note.find(params[:id])
@note_comments = @note.comments.unscope(:where => :visible)
else
cs = Changeset.from_xml(request.raw_post, true)
# Assume that Changeset.from_xml has thrown an exception if there is an error parsing the xml
cs = Changeset.from_xml(request.raw_post, true)
# Assume that Changeset.from_xml has thrown an exception if there is an error parsing the xml
+ cs.user_id = current_user.id
cs.save_with_tags!
# Subscribe user to changeset comments
cs.save_with_tags!
# Subscribe user to changeset comments
- cs.subscribers << @user
+ cs.subscribers << current_user
render :plain => cs.id.to_s
end
render :plain => cs.id.to_s
end
assert_method :put
changeset = Changeset.find(params[:id])
assert_method :put
changeset = Changeset.find(params[:id])
- check_changeset_consistency(changeset, @user)
+ check_changeset_consistency(changeset, current_user)
# to close the changeset, we'll just set its closed_at time to
# now. this might not be enough if there are concurrency issues,
# to close the changeset, we'll just set its closed_at time to
# now. this might not be enough if there are concurrency issues,
assert_method :post
cs = Changeset.find(params[:id])
assert_method :post
cs = Changeset.find(params[:id])
- check_changeset_consistency(cs, @user)
+ check_changeset_consistency(cs, current_user)
# keep an array of lons and lats
lon = []
# keep an array of lons and lats
lon = []
assert_method :post
changeset = Changeset.find(params[:id])
assert_method :post
changeset = Changeset.find(params[:id])
- check_changeset_consistency(changeset, @user)
+ check_changeset_consistency(changeset, current_user)
diff_reader = DiffReader.new(request.raw_post, changeset)
Changeset.transaction do
diff_reader = DiffReader.new(request.raw_post, changeset)
Changeset.transaction do
changeset = Changeset.find(params[:id])
new_changeset = Changeset.from_xml(request.raw_post)
changeset = Changeset.find(params[:id])
new_changeset = Changeset.from_xml(request.raw_post)
- check_changeset_consistency(changeset, @user)
- changeset.update_from(new_changeset, @user)
+ check_changeset_consistency(changeset, current_user)
+ changeset.update_from(new_changeset, current_user)
render :xml => changeset.to_xml.to_s
end
render :xml => changeset.to_xml.to_s
end
- if (@params[:friends] || @params[:nearby]) && !@user
+ if (@params[:friends] || @params[:nearby]) && !current_user
changesets = conditions_nonempty(Changeset.all)
if @params[:display_name]
changesets = conditions_nonempty(Changeset.all)
if @params[:display_name]
- changesets = if user.data_public? || user == @user
+ changesets = if user.data_public? || user == current_user
changesets.where(:user_id => user.id)
else
changesets.where("false")
end
elsif @params[:bbox]
changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
changesets.where(:user_id => user.id)
else
changesets.where("false")
end
elsif @params[:bbox]
changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
- elsif @params[:friends] && @user
- changesets = changesets.where(:user_id => @user.friend_users.identifiable)
- elsif @params[:nearby] && @user
- changesets = changesets.where(:user_id => @user.nearby)
+ elsif @params[:friends] && current_user
+ changesets = changesets.where(:user_id => current_user.friend_users.identifiable)
+ elsif @params[:nearby] && current_user
+ changesets = changesets.where(:user_id => current_user.nearby)
# Add a comment to the changeset
comment = changeset.comments.create(:changeset => changeset,
:body => body,
# Add a comment to the changeset
comment = changeset.comments.create(:changeset => changeset,
:body => body,
+ :author => current_user)
# Notify current subscribers of the new comment
changeset.subscribers.visible.each do |user|
# Notify current subscribers of the new comment
changeset.subscribers.visible.each do |user|
+ if current_user != user
Notifier.changeset_comment_notification(comment, user).deliver_now
end
end
# Add the commenter to the subscribers if necessary
Notifier.changeset_comment_notification(comment, user).deliver_now
end
end
# Add the commenter to the subscribers if necessary
- changeset.subscribers << @user unless changeset.subscribers.exists?(@user.id)
+ changeset.subscribers << current_user unless changeset.subscribers.exists?(current_user.id)
# Return a copy of the updated changeset
render :xml => changeset.to_xml.to_s
# Return a copy of the updated changeset
render :xml => changeset.to_xml.to_s
# Find the changeset and check it is valid
changeset = Changeset.find(id)
raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
# Find the changeset and check it is valid
changeset = Changeset.find(id)
raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
- raise OSM::APIChangesetAlreadySubscribedError.new(changeset) if changeset.subscribers.exists?(@user.id)
+ raise OSM::APIChangesetAlreadySubscribedError.new(changeset) if changeset.subscribers.exists?(current_user.id)
- changeset.subscribers << @user
+ changeset.subscribers << current_user
# Return a copy of the updated changeset
render :xml => changeset.to_xml.to_s
# Return a copy of the updated changeset
render :xml => changeset.to_xml.to_s
# Find the changeset and check it is valid
changeset = Changeset.find(id)
raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
# Find the changeset and check it is valid
changeset = Changeset.find(id)
raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
- raise OSM::APIChangesetNotSubscribedError.new(changeset) unless changeset.subscribers.exists?(@user.id)
+ raise OSM::APIChangesetNotSubscribedError.new(changeset) unless changeset.subscribers.exists?(current_user.id)
- changeset.subscribers.delete(@user)
+ changeset.subscribers.delete(current_user)
# Return a copy of the updated changeset
render :xml => changeset.to_xml.to_s
# Return a copy of the updated changeset
render :xml => changeset.to_xml.to_s
# changesets if they're non-public
setup_user_auth
# changesets if they're non-public
setup_user_auth
- raise OSM::APINotFoundError if @user.nil? || @user.id != u.id
+ raise OSM::APINotFoundError if current_user.nil? || current_user.id != u.id
end
changesets.where(:user_id => u.id)
end
changesets.where(:user_id => u.id)
if request.post?
@diary_entry = DiaryEntry.new(entry_params)
if request.post?
@diary_entry = DiaryEntry.new(entry_params)
- @diary_entry.user = @user
+ @diary_entry.user = current_user
- 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
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
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 => "list", :display_name => current_user.display_name
else
render :action => "edit"
end
else
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
+ 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"
@diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))
set_map_location
render :action => "edit"
@title = t "diary_entry.edit.title"
@diary_entry = DiaryEntry.find(params[:id])
@title = t "diary_entry.edit.title"
@diary_entry = DiaryEntry.find(params[:id])
- if @user != @diary_entry.user
+ if current_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]
redirect_to :action => "view", :id => params[:id]
elsif params[:diary_entry] && @diary_entry.update_attributes(entry_params)
redirect_to :action => "view", :id => params[:id]
def comment
@entry = DiaryEntry.find(params[:id])
@diary_comment = @entry.comments.build(comment_params)
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 @diary_comment.save
# Notify current subscribers of the new comment
@entry.subscribers.visible.each do |user|
+ if current_user != user
Notifier.diary_comment_notification(@diary_comment, user).deliver_now
end
end
# Add the commenter to the subscribers if necessary
Notifier.diary_comment_notification(@diary_comment, user).deliver_now
end
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
else
redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
else
def subscribe
diary_entry = DiaryEntry.find(params[:id])
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
rescue ActiveRecord::RecordNotFound
redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
rescue ActiveRecord::RecordNotFound
def unsubscribe
diary_entry = DiaryEntry.find(params[:id])
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
rescue ActiveRecord::RecordNotFound
redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
rescue ActiveRecord::RecordNotFound
return
end
elsif params[:friends]
return
end
elsif params[:friends]
@title = t "diary_entry.list.title_friends"
@title = t "diary_entry.list.title_friends"
- @entries = DiaryEntry.where(:user_id => @user.friend_users)
+ @entries = DiaryEntry.where(:user_id => current_user.friend_users)
else
require_user
return
end
elsif params[:nearby]
else
require_user
return
end
elsif params[:nearby]
@title = t "diary_entry.list.title_nearby"
@title = t "diary_entry.list.title_nearby"
- @entries = DiaryEntry.where(:user_id => @user.nearby)
+ @entries = DiaryEntry.where(:user_id => current_user.nearby)
# require that the user is a administrator, or fill out a helpful error message
# and return them to the user page.
def require_administrator
# 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"
end
flash[:error] = t("user.filter.not_an_administrator")
redirect_to :action => "view"
end
@lon = @diary_entry.longitude
@lat = @diary_entry.latitude
@zoom = 12
@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 = 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
# The display_name param is the display name of the user that the message is being sent to.
def new
if request.post?
# The display_name param is the display name of the user that the message is being sent to.
def new
if request.post?
- if @user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
+ if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
flash[:error] = t "message.new.limit_exceeded"
else
@message = Message.new(message_params)
@message.to_user_id = @this_user.id
flash[:error] = t "message.new.limit_exceeded"
else
@message = Message.new(message_params)
@message.to_user_id = @this_user.id
- @message.from_user_id = @user.id
+ @message.from_user_id = current_user.id
@message.sent_on = Time.now.getutc
if @message.save
flash[:notice] = t "message.new.message_sent"
Notifier.message_notification(@message).deliver_now
@message.sent_on = Time.now.getutc
if @message.save
flash[:notice] = t "message.new.message_sent"
Notifier.message_notification(@message).deliver_now
- redirect_to :action => "inbox", :display_name => @user.display_name
+ redirect_to :action => "inbox", :display_name => current_user.display_name
def reply
message = Message.find(params[:message_id])
def reply
message = Message.find(params[:message_id])
- if message.to_user_id == @user.id
+ if message.to_user_id == current_user.id
message.update(:message_read => true)
@message = Message.new(
message.update(:message_read => true)
@message = Message.new(
render :action => "new"
else
render :action => "new"
else
- flash[:notice] = t "message.reply.wrong_user", :user => @user.display_name
+ flash[:notice] = t "message.reply.wrong_user", :user => current_user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
@title = t "message.read.title"
@message = Message.find(params[:message_id])
@title = t "message.read.title"
@message = Message.find(params[:message_id])
- if @message.to_user_id == @user.id || @message.from_user_id == @user.id
- @message.message_read = true if @message.to_user_id == @user.id
+ if @message.to_user_id == current_user.id || @message.from_user_id == current_user.id
+ @message.message_read = true if @message.to_user_id == current_user.id
- flash[:notice] = t "message.read.wrong_user", :user => @user.display_name
+ flash[:notice] = t "message.read.wrong_user", :user => current_user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
# Display the list of messages that have been sent to the user.
def inbox
@title = t "message.inbox.title"
# Display the list of messages that have been sent to the user.
def inbox
@title = t "message.inbox.title"
- if @user && params[:display_name] == @user.display_name
+ if current_user && params[:display_name] == current_user.display_name
- redirect_to :action => "inbox", :display_name => @user.display_name
+ redirect_to :action => "inbox", :display_name => current_user.display_name
end
end
# Display the list of messages that the user has sent to other users.
def outbox
@title = t "message.outbox.title"
end
end
# Display the list of messages that the user has sent to other users.
def outbox
@title = t "message.outbox.title"
- if @user && params[:display_name] == @user.display_name
+ if current_user && params[:display_name] == current_user.display_name
- redirect_to :action => "outbox", :display_name => @user.display_name
+ redirect_to :action => "outbox", :display_name => current_user.display_name
end
end
# Set the message as being read or unread.
def mark
end
end
# Set the message as being read or unread.
def mark
- @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id])
+ @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
if params[:mark] == "unread"
message_read = false
notice = t "message.mark.as_unread"
if params[:mark] == "unread"
message_read = false
notice = t "message.mark.as_unread"
@message.message_read = message_read
if @message.save && !request.xhr?
flash[:notice] = notice
@message.message_read = message_read
if @message.save && !request.xhr?
flash[:notice] = notice
- redirect_to :action => "inbox", :display_name => @user.display_name
+ redirect_to :action => "inbox", :display_name => current_user.display_name
end
rescue ActiveRecord::RecordNotFound
@title = t "message.no_such_message.title"
end
rescue ActiveRecord::RecordNotFound
@title = t "message.no_such_message.title"
# Delete the message.
def delete
# Delete the message.
def delete
- @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id])
- @message.from_user_visible = false if @message.sender == @user
- @message.to_user_visible = false if @message.recipient == @user
+ @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
+ @message.from_user_visible = false if @message.sender == current_user
+ @message.to_user_visible = false if @message.recipient == current_user
if @message.save && !request.xhr?
flash[:notice] = t "message.delete.deleted"
if params[:referer]
redirect_to params[:referer]
else
if @message.save && !request.xhr?
flash[:notice] = t "message.delete.deleted"
if params[:referer]
redirect_to params[:referer]
else
- redirect_to :action => "inbox", :display_name => @user.display_name
+ redirect_to :action => "inbox", :display_name => current_user.display_name
end
end
rescue ActiveRecord::RecordNotFound
end
end
rescue ActiveRecord::RecordNotFound
node = Node.from_xml(request.raw_post, true)
# Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
node = Node.from_xml(request.raw_post, true)
# Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
- node.create_with_history @user
+ node.create_with_history current_user
render :plain => node.id.to_s
end
render :plain => node.id.to_s
end
raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
end
raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
end
- node.update_from(new_node, @user)
+ node.update_from(new_node, current_user)
render :plain => node.version.to_s
end
render :plain => node.version.to_s
end
unless new_node && new_node.id == node.id
raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
end
unless new_node && new_node.id == node.id
raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
end
- node.delete_with_history!(new_node, @user)
+ node.delete_with_history!(new_node, current_user)
render :plain => node.version.to_s
end
render :plain => node.version.to_s
end
# Find the note and check it is valid
@note = Note.find_by(:id => id)
raise OSM::APINotFoundError unless @note
# Find the note and check it is valid
@note = Note.find_by(:id => id)
raise OSM::APINotFoundError unless @note
- raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || @user.moderator?
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || current_user.moderator?
raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? || !@note.visible?
# Reopen the note and add a comment
raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? || !@note.visible?
# Reopen the note and add a comment
@page = (params[:page] || 1).to_i
@page_size = 10
@notes = @this_user.notes
@page = (params[:page] || 1).to_i
@page_size = 10
@notes = @this_user.notes
- @notes = @notes.visible unless @user && @user.moderator?
+ @notes = @notes.visible unless current_user && current_user.moderator?
@notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
else
@title = t "user.no_such_user.title"
@notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
else
@title = t "user.no_such_user.title"
def add_comment(note, text, event, notify = true)
attributes = { :visible => true, :event => event, :body => text }
def add_comment(note, text, event, notify = true)
attributes = { :visible => true, :event => event, :body => text }
- if @user
- attributes[:author_id] = @user.id
+ if current_user
+ attributes[:author_id] = current_user.id
else
attributes[:author_ip] = request.remote_ip
end
else
attributes[:author_ip] = request.remote_ip
end
comment = note.comments.create!(attributes)
note.comments.map(&:author).uniq.each do |user|
comment = note.comments.create!(attributes)
note.comments.map(&:author).uniq.each do |user|
- if notify && user && user != @user && user.visible?
+ if notify && user && user != current_user && user.visible?
Notifier.note_comment_notification(comment, user).deliver_now
end
end
Notifier.note_comment_notification(comment, user).deliver_now
end
end
before_action :require_user
def index
before_action :require_user
def index
- @client_applications = @user.client_applications
- @tokens = @user.oauth_tokens.authorized
+ @client_applications = current_user.client_applications
+ @tokens = current_user.oauth_tokens.authorized
- @client_application = @user.client_applications.build(application_params)
+ @client_application = current_user.client_applications.build(application_params)
if @client_application.save
flash[:notice] = t "oauth_clients.create.flash"
redirect_to :action => "show", :id => @client_application.id
if @client_application.save
flash[:notice] = t "oauth_clients.create.flash"
redirect_to :action => "show", :id => @client_application.id
- @client_application = @user.client_applications.find(params[:id])
+ @client_application = current_user.client_applications.find(params[:id])
rescue ActiveRecord::RecordNotFound
@type = "client application"
render :action => "not_found", :status => :not_found
end
def edit
rescue ActiveRecord::RecordNotFound
@type = "client application"
render :action => "not_found", :status => :not_found
end
def edit
- @client_application = @user.client_applications.find(params[:id])
+ @client_application = current_user.client_applications.find(params[:id])
rescue ActiveRecord::RecordNotFound
@type = "client application"
render :action => "not_found", :status => :not_found
end
def update
rescue ActiveRecord::RecordNotFound
@type = "client application"
render :action => "not_found", :status => :not_found
end
def update
- @client_application = @user.client_applications.find(params[:id])
+ @client_application = current_user.client_applications.find(params[:id])
if @client_application.update_attributes(application_params)
flash[:notice] = t "oauth_clients.update.flash"
redirect_to :action => "show", :id => @client_application.id
if @client_application.update_attributes(application_params)
flash[:notice] = t "oauth_clients.update.flash"
redirect_to :action => "show", :id => @client_application.id
- @client_application = @user.client_applications.find(params[:id])
+ @client_application = current_user.client_applications.find(params[:id])
@client_application.destroy
flash[:notice] = t "oauth_clients.destroy.flash"
redirect_to :action => "index"
@client_application.destroy
flash[:notice] = t "oauth_clients.destroy.flash"
redirect_to :action => "index"
private
def show_redactions?
private
def show_redactions?
- @user && @user.moderator? && params[:show_redactions] == "true"
+ current_user && current_user.moderator? && params[:show_redactions] == "true"
def create
@redaction = Redaction.new
def create
@redaction = Redaction.new
- @redaction.user = @user
+ @redaction.user = current_user
@redaction.title = params[:redaction][:title]
@redaction.description = params[:redaction][:description]
# note that the description format will default to 'markdown'
@redaction.title = params[:redaction][:title]
@redaction.description = params[:redaction][:description]
# note that the description format will default to 'markdown'
relation = Relation.from_xml(request.raw_post, true)
# Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
relation = Relation.from_xml(request.raw_post, true)
# Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
- relation.create_with_history @user
+ relation.create_with_history current_user
render :plain => relation.id.to_s
end
render :plain => relation.id.to_s
end
raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
end
raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
end
- relation.update_from new_relation, @user
+ relation.update_from new_relation, current_user
render :plain => relation.version.to_s
end
render :plain => relation.version.to_s
end
relation = Relation.find(params[:id])
new_relation = Relation.from_xml(request.raw_post)
if new_relation && new_relation.id == relation.id
relation = Relation.find(params[:id])
new_relation = Relation.from_xml(request.raw_post)
if new_relation && new_relation.id == relation.id
- relation.delete_with_history!(new_relation, @user)
+ relation.delete_with_history!(new_relation, current_user)
render :plain => relation.version.to_s
else
head :bad_request
render :plain => relation.version.to_s
else
head :bad_request
@lat = note.lat
@lon = note.lon
@zoom = 17
@lat = note.lat
@lon = note.lon
@zoom = 17
- elsif params[:gpx] && @user
- trace = Trace.visible_to(@user).find(params[:gpx])
+ elsif params[:gpx] && current_user
+ trace = Trace.visible_to(current_user).find(params[:gpx])
@lat = trace.latitude
@lon = trace.longitude
@zoom = 16
@lat = trace.latitude
@lon = trace.longitude
@zoom = 16
# set title
@title = if target_user.nil?
t "trace.list.public_traces"
# set title
@title = if target_user.nil?
t "trace.list.public_traces"
- elsif @user && @user == target_user
+ elsif current_user && current_user == target_user
t "trace.list.your_traces"
else
t "trace.list.public_traces_from", :user => target_user.display_name
t "trace.list.your_traces"
else
t "trace.list.public_traces_from", :user => target_user.display_name
# 3 - user's traces, logged in as same user = all user's traces
# 4 - user's traces, not logged in as that user = all user's public traces
@traces = if target_user.nil? # all traces
# 3 - user's traces, logged in as same user = all user's traces
# 4 - user's traces, not logged in as that user = all user's public traces
@traces = if target_user.nil? # all traces
- if @user
- Trace.visible_to(@user) # 1
+ if current_user
+ Trace.visible_to(current_user) # 1
else
Trace.visible_to_all # 2
end
else
Trace.visible_to_all # 2
end
- elsif @user && @user == target_user
- @user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name)
+ elsif current_user && current_user == target_user
+ current_user.traces # 3 (check vs user id, so no join + can't pick up non-public traces by changing name)
else
target_user.traces.visible_to_all # 4
end
else
target_user.traces.visible_to_all # 4
end
- redirect_to :action => :list, :display_name => @user.display_name
+ redirect_to :action => :list, :display_name => current_user.display_name
end
def view
@trace = Trace.find(params[:id])
if @trace && @trace.visible? &&
end
def view
@trace = Trace.find(params[:id])
if @trace && @trace.visible? &&
- (@trace.public? || @trace.user == @user)
+ (@trace.public? || @trace.user == current_user)
@title = t "trace.view.title", :name => @trace.name
else
flash[:error] = t "trace.view.trace_not_found"
@title = t "trace.view.title", :name => @trace.name
else
flash[:error] = t "trace.view.trace_not_found"
if @trace.id
flash[:notice] = t "trace.create.trace_uploaded"
if @trace.id
flash[:notice] = t "trace.create.trace_uploaded"
- if @user.traces.where(:inserted => false).count > 4
- flash[:warning] = t "trace.trace_header.traces_waiting", :count => @user.traces.where(:inserted => false).count
+ if current_user.traces.where(:inserted => false).count > 4
+ flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count
- redirect_to :action => :list, :display_name => @user.display_name
+ redirect_to :action => :list, :display_name => current_user.display_name
end
else
@trace = Trace.new(:name => "Dummy",
:tagstring => params[:trace][:tagstring],
:description => params[:trace][:description],
:visibility => params[:trace][:visibility],
end
else
@trace = Trace.new(:name => "Dummy",
:tagstring => params[:trace][:tagstring],
:description => params[:trace][:description],
:visibility => params[:trace][:visibility],
- :inserted => false, :user => @user,
+ :inserted => false, :user => current_user,
:timestamp => Time.now.getutc)
@trace.valid?
@trace.errors.add(:gpx_file, "can't be blank")
:timestamp => Time.now.getutc)
@trace.valid?
@trace.errors.add(:gpx_file, "can't be blank")
def data
trace = Trace.find(params[:id])
def data
trace = Trace.find(params[:id])
- if trace.visible? && (trace.public? || (@user && @user == trace.user))
+ if trace.visible? && (trace.public? || (current_user && current_user == trace.user))
if Acl.no_trace_download(request.remote_ip)
head :forbidden
elsif request.format == Mime[:xml]
if Acl.no_trace_download(request.remote_ip)
head :forbidden
elsif request.format == Mime[:xml]
if !@trace.visible?
head :not_found
if !@trace.visible?
head :not_found
- elsif @user.nil? || @trace.user != @user
+ elsif current_user.nil? || @trace.user != current_user
head :forbidden
else
@title = t "trace.edit.title", :name => @trace.name
head :forbidden
else
@title = t "trace.edit.title", :name => @trace.name
@trace.tagstring = params[:trace][:tagstring]
@trace.visibility = params[:trace][:visibility]
if @trace.save
@trace.tagstring = params[:trace][:tagstring]
@trace.visibility = params[:trace][:visibility]
if @trace.save
- redirect_to :action => "view", :display_name => @user.display_name
+ redirect_to :action => "view", :display_name => current_user.display_name
if !trace.visible?
head :not_found
if !trace.visible?
head :not_found
- elsif @user.nil? || trace.user != @user
+ elsif current_user.nil? || trace.user != current_user
head :forbidden
else
trace.visible = false
trace.save
flash[:notice] = t "trace.delete.scheduled_for_deletion"
head :forbidden
else
trace.visible = false
trace.save
flash[:notice] = t "trace.delete.scheduled_for_deletion"
- redirect_to :action => :list, :display_name => @user.display_name
+ redirect_to :action => :list, :display_name => current_user.display_name
end
rescue ActiveRecord::RecordNotFound
head :not_found
end
rescue ActiveRecord::RecordNotFound
head :not_found
trace = Trace.find(params[:id])
if trace.visible? && trace.inserted?
trace = Trace.find(params[:id])
if trace.visible? && trace.inserted?
- if trace.public? || (@user && @user == trace.user)
+ if trace.public? || (current_user && current_user == trace.user)
expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
else
expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
else
trace = Trace.find(params[:id])
if trace.visible? && trace.inserted?
trace = Trace.find(params[:id])
if trace.visible? && trace.inserted?
- if trace.public? || (@user && @user == trace.user)
+ if trace.public? || (current_user && current_user == trace.user)
expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
else
expires_in 7.days, :private => !trace.public?, :public => trace.public?
send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
else
def api_read
trace = Trace.visible.find(params[:id])
def api_read
trace = Trace.visible.find(params[:id])
- if trace.public? || trace.user == @user
+ if trace.public? || trace.user == current_user
render :xml => trace.to_xml.to_s
else
head :forbidden
render :xml => trace.to_xml.to_s
else
head :forbidden
def api_update
trace = Trace.visible.find(params[:id])
def api_update
trace = Trace.visible.find(params[:id])
+ if trace.user == current_user
new_trace = Trace.from_xml(request.raw_post)
unless new_trace && new_trace.id == trace.id
new_trace = Trace.from_xml(request.raw_post)
unless new_trace && new_trace.id == trace.id
def api_delete
trace = Trace.visible.find(params[:id])
def api_delete
trace = Trace.visible.find(params[:id])
+ if trace.user == current_user
trace.visible = false
trace.save!
trace.visible = false
trace.save!
def api_data
trace = Trace.visible.find(params[:id])
def api_data
trace = Trace.visible.find(params[:id])
- if trace.public? || trace.user == @user
+ if trace.public? || trace.user == current_user
if request.format == Mime[:xml]
send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
elsif request.format == Mime[:gpx]
if request.format == Mime[:xml]
send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
elsif request.format == Mime[:gpx]
:description => description,
:visibility => visibility,
:inserted => true,
:description => description,
:visibility => visibility,
:inserted => true,
:timestamp => Time.now.getutc
)
:timestamp => Time.now.getutc
)
end
# Finally save the user's preferred privacy level
end
# Finally save the user's preferred privacy level
- if pref = @user.preferences.where(:k => "gps.trace.visibility").first
+ if pref = current_user.preferences.where(:k => "gps.trace.visibility").first
pref.v = visibility
pref.save
else
pref.v = visibility
pref.save
else
- @user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
+ current_user.preferences.create(:k => "gps.trace.visibility", :v => visibility)
end
def default_visibility
end
def default_visibility
- visibility = @user.preferences.where(:k => "gps.trace.visibility").first
+ visibility = current_user.preferences.where(:k => "gps.trace.visibility").first
if visibility
visibility.v
if visibility
visibility.v
- elsif @user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil?
+ elsif current_user.preferences.where(:k => "gps.trace.public", :v => "default").first.nil?
- if @user && @user.id == @user_block.user_id
+ if current_user && current_user.id == @user_block.user_id
@user_block.needs_view = false
@user_block.save!
end
@user_block.needs_view = false
@user_block.save!
end
if @valid_params
@user_block = UserBlock.new(
:user_id => @this_user.id,
if @valid_params
@user_block = UserBlock.new(
:user_id => @this_user.id,
- :creator_id => @user.id,
+ :creator_id => current_user.id,
:reason => params[:user_block][:reason],
:ends_at => Time.now.getutc + @block_period.hours,
:needs_view => params[:user_block][:needs_view]
:reason => params[:user_block][:reason],
:ends_at => Time.now.getutc + @block_period.hours,
:needs_view => params[:user_block][:needs_view]
def update
if @valid_params
def update
if @valid_params
- if @user_block.creator_id != @user.id
+ if @user_block.creator_id != current_user.id
flash[:error] = t("user_block.update.only_creator_can_edit")
redirect_to :action => "edit"
elsif @user_block.update_attributes(
flash[:error] = t("user_block.update.only_creator_can_edit")
redirect_to :action => "edit"
elsif @user_block.update_attributes(
# revokes the block, setting the end_time to now
def revoke
if params[:confirm]
# revokes the block, setting the end_time to now
def revoke
if params[:confirm]
- if @user_block.revoke! @user
+ if @user_block.revoke! current_user
flash[:notice] = t "user_block.revoke.flash"
redirect_to(@user_block)
end
flash[:notice] = t "user_block.revoke.flash"
redirect_to(@user_block)
end
def read
doc = OSM::API.new.get_xml_doc
def read
doc = OSM::API.new.get_xml_doc
- prefs = @user.preferences
+ prefs = current_user.preferences
el1 = XML::Node.new "preferences"
el1 = XML::Node.new "preferences"
##
# return the value for a single preference
def read_one
##
# return the value for a single preference
def read_one
- pref = UserPreference.find([@user.id, params[:preference_key]])
+ pref = UserPreference.find([current_user.id, params[:preference_key]])
render :plain => pref.v.to_s
end
# update the entire set of preferences
def update
render :plain => pref.v.to_s
end
# update the entire set of preferences
def update
- old_preferences = @user.preferences.each_with_object({}) do |preference, preferences|
+ old_preferences = current_user.preferences.each_with_object({}) do |preference, preferences|
preferences[preference.k] = preference
end
preferences[preference.k] = preference
end
elsif new_preferences.include?(pt["k"])
raise OSM::APIDuplicatePreferenceError.new(pt["k"])
else
elsif new_preferences.include?(pt["k"])
raise OSM::APIDuplicatePreferenceError.new(pt["k"])
else
- preference = @user.preferences.build(:k => pt["k"], :v => pt["v"])
+ preference = current_user.preferences.build(:k => pt["k"], :v => pt["v"])
end
new_preferences[preference.k] = preference
end
new_preferences[preference.k] = preference
# update the value of a single preference
def update_one
begin
# update the value of a single preference
def update_one
begin
- pref = UserPreference.find([@user.id, params[:preference_key]])
+ pref = UserPreference.find([current_user.id, params[:preference_key]])
rescue ActiveRecord::RecordNotFound
pref = UserPreference.new
rescue ActiveRecord::RecordNotFound
pref = UserPreference.new
+ pref.user = current_user
pref.k = params[:preference_key]
end
pref.k = params[:preference_key]
end
##
# delete a single preference
def delete_one
##
# delete a single preference
def delete_one
- UserPreference.find([@user.id, params[:preference_key]]).delete
+ UserPreference.find([current_user.id, params[:preference_key]]).delete
before_action :in_role, :only => [:revoke]
def grant
before_action :in_role, :only => [:revoke]
def grant
- @this_user.roles.create(:role => @role, :granter_id => @user.id)
+ @this_user.roles.create(:role => @role, :granter_id => current_user.id)
redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
end
redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
end
# require that the user is an administrator, or fill out a helpful error message
# and return them to theuser page.
def require_administrator
# require that the user is an administrator, or fill out a helpful error message
# and return them to theuser page.
def require_administrator
- unless @user.administrator?
+ unless current_user.administrator?
flash[:error] = t "user_role.filter.not_an_administrator"
redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
end
flash[:error] = t "user_role.filter.not_an_administrator"
redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name
end
way = Way.from_xml(request.raw_post, true)
# Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
way = Way.from_xml(request.raw_post, true)
# Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
- way.create_with_history @user
+ way.create_with_history current_user
render :plain => way.id.to_s
end
render :plain => way.id.to_s
end
raise OSM::APIBadUserInput.new("The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})")
end
raise OSM::APIBadUserInput.new("The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})")
end
- way.update_from(new_way, @user)
+ way.update_from(new_way, current_user)
render :plain => way.version.to_s
end
render :plain => way.version.to_s
end
new_way = Way.from_xml(request.raw_post)
if new_way && new_way.id == way.id
new_way = Way.from_xml(request.raw_post)
if new_way && new_way.id == way.id
- way.delete_with_history!(new_way, @user)
+ way.delete_with_history!(new_way, current_user)
render :plain => way.version.to_s
else
head :bad_request
render :plain => way.version.to_s
else
head :bad_request
projects / rails.git / commitdiff