summaryrefslogtreecommitdiffstats
path: root/app/controllers/timelog_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-18 14:22:18 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-12-18 14:22:18 +0000
commit488c192286ead874fcdfe04b6acf52e52e5cf9fc (patch)
tree1f72837b55d8da5ff89ee6cdbfc2d0a2ba514153 /app/controllers/timelog_controller.rb
parent0e4525d76caf5d8228b01deb417f9ba67a831b93 (diff)
downloadredmine-488c192286ead874fcdfe04b6acf52e52e5cf9fc.tar.gz
redmine-488c192286ead874fcdfe04b6acf52e52e5cf9fc.zip
Removes "xxx and return" calls (#4446).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3185 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/timelog_controller.rb')
-rw-r--r--app/controllers/timelog_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 4355141c7..c08815890 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -209,7 +209,7 @@ class TimelogController < ApplicationController
end
def edit
- render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
+ (render_403; return) if @time_entry && !@time_entry.editable_by?(User.current)
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
@time_entry.attributes = params[:time_entry]
@@ -223,8 +223,8 @@ class TimelogController < ApplicationController
end
def destroy
- render_404 and return unless @time_entry
- render_403 and return unless @time_entry.editable_by?(User.current)
+ (render_404; return) unless @time_entry
+ (render_403; return) unless @time_entry.editable_by?(User.current)
@time_entry.destroy
flash[:notice] = l(:notice_successful_delete)
redirect_to :back