Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-10-31 10:25:55 +01:00
Code Issues Packages Projects Releases Activity

shorten long line of TimelogController

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20116 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-10-03 15:36:59 +00:00
parent c4a95d5aeb
commit 4e8eda64d7
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/controllers/timelog_controller.rb
View File

@@ -79,7 +79,10 @@ class TimelogController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { render :layout => !request.xhr? } format.html { render :layout => !request.xhr? }
format.csv { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') } format.csv do
send_data(report_to_csv(@report), :type => 'text/csv; header=present',
:filename => 'timelog.csv')
end
end end
end end
@@ -92,19 +95,25 @@ class TimelogController < ApplicationController
end end
def new def new
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :author => User.current, :spent_on => User.current.today) @time_entry ||=
TimeEntry.new(:project => @project, :issue => @issue,
:author => User.current, :spent_on => User.current.today)
@time_entry.safe_attributes = params[:time_entry] @time_entry.safe_attributes = params[:time_entry]
end end
def create def create
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :author => User.current, :user => User.current, :spent_on => User.current.today) @time_entry ||=
TimeEntry.new(:project => @project, :issue => @issue,
:author => User.current, :user => User.current,
:spent_on => User.current.today)
@time_entry.safe_attributes = params[:time_entry] @time_entry.safe_attributes = params[:time_entry]
if @time_entry.project && !User.current.allowed_to?(:log_time, @time_entry.project) if @time_entry.project && !User.current.allowed_to?(:log_time, @time_entry.project)
render_403 render_403
return return
end end
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry }) call_hook(:controller_timelog_edit_before_save,
{:params => params, :time_entry => @time_entry})
if @time_entry.save if @time_entry.save
respond_to do |format| respond_to do |format|
@@ -131,7 +140,9 @@ class TimelogController < ApplicationController
redirect_back_or_default project_time_entries_path(@time_entry.project) redirect_back_or_default project_time_entries_path(@time_entry.project)
end end
} }
format.api { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) } format.api do
render :action => 'show', :status => :created, :location => time_entry_url(@time_entry)
end
end end
else else
respond_to do |format| respond_to do |format|
@@ -147,7 +158,8 @@ class TimelogController < ApplicationController
def update def update
@time_entry.safe_attributes = params[:time_entry] @time_entry.safe_attributes = params[:time_entry]
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry }) call_hook(:controller_timelog_edit_before_save,
{:params => params, :time_entry => @time_entry})
if @time_entry.save if @time_entry.save
respond_to do |format| respond_to do |format|
@@ -189,7 +201,10 @@ class TimelogController < ApplicationController
@time_entries.each do |time_entry| @time_entries.each do |time_entry|
time_entry.reload time_entry.reload
time_entry.safe_attributes = attributes time_entry.safe_attributes = attributes
call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry }) call_hook(
:controller_time_entries_bulk_edit_before_save,
{:params => params, :time_entry => time_entry}
)
if time_entry.save if time_entry.save
saved_time_entries << time_entry saved_time_entries << time_entry
else else