##// END OF EJS Templates
Don't use finder options....
Jean-Philippe Lang -
r11815:0ac3afebc62b
parent child
Show More
@@ -1,308 +1,299
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2013 Jean-Philippe Lang
2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class TimelogController < ApplicationController
18 class TimelogController < ApplicationController
19 menu_item :issues
19 menu_item :issues
20
20
21 before_filter :find_project_for_new_time_entry, :only => [:create]
21 before_filter :find_project_for_new_time_entry, :only => [:create]
22 before_filter :find_time_entry, :only => [:show, :edit, :update]
22 before_filter :find_time_entry, :only => [:show, :edit, :update]
23 before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
23 before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
24 before_filter :authorize, :except => [:new, :index, :report]
24 before_filter :authorize, :except => [:new, :index, :report]
25
25
26 before_filter :find_optional_project, :only => [:index, :report]
26 before_filter :find_optional_project, :only => [:index, :report]
27 before_filter :find_optional_project_for_new_time_entry, :only => [:new]
27 before_filter :find_optional_project_for_new_time_entry, :only => [:new]
28 before_filter :authorize_global, :only => [:new, :index, :report]
28 before_filter :authorize_global, :only => [:new, :index, :report]
29
29
30 accept_rss_auth :index
30 accept_rss_auth :index
31 accept_api_auth :index, :show, :create, :update, :destroy
31 accept_api_auth :index, :show, :create, :update, :destroy
32
32
33 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
33 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
34
34
35 helper :sort
35 helper :sort
36 include SortHelper
36 include SortHelper
37 helper :issues
37 helper :issues
38 include TimelogHelper
38 include TimelogHelper
39 helper :custom_fields
39 helper :custom_fields
40 include CustomFieldsHelper
40 include CustomFieldsHelper
41 helper :queries
41 helper :queries
42 include QueriesHelper
42 include QueriesHelper
43
43
44 def index
44 def index
45 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
45 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
46
46
47 sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria)
47 sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria)
48 sort_update(@query.sortable_columns)
48 sort_update(@query.sortable_columns)
49 scope = time_entry_scope(:order => sort_clause).
49 scope = time_entry_scope(:order => sort_clause).
50 includes(:project, :activity, :user, :issue).
50 includes(:project, :activity, :user, :issue).
51 preload(:issue => [:project, :tracker, :status, :assigned_to, :priority])
51 preload(:issue => [:project, :tracker, :status, :assigned_to, :priority])
52
52
53 respond_to do |format|
53 respond_to do |format|
54 format.html {
54 format.html {
55 # Paginate results
56 @entry_count = scope.count
55 @entry_count = scope.count
57 @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
56 @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
58 @entries = scope.all(
57 @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).all
59 :limit => @entry_pages.per_page,
60 :offset => @entry_pages.offset
61 )
62 @total_hours = scope.sum(:hours).to_f
58 @total_hours = scope.sum(:hours).to_f
63
59
64 render :layout => !request.xhr?
60 render :layout => !request.xhr?
65 }
61 }
66 format.api {
62 format.api {
67 @entry_count = scope.count
63 @entry_count = scope.count
68 @offset, @limit = api_offset_and_limit
64 @offset, @limit = api_offset_and_limit
69 @entries = scope.preload(:custom_values => :custom_field).all(
65 @entries = scope.offset(@offset).limit(@limit).preload(:custom_values => :custom_field).all
70 :limit => @limit,
71 :offset => @offset
72 )
73 }
66 }
74 format.atom {
67 format.atom {
75 entries = scope.reorder("#{TimeEntry.table_name}.created_on DESC").all(
68 entries = scope.limit(Setting.feeds_limit.to_i).reorder("#{TimeEntry.table_name}.created_on DESC").all
76 :limit => Setting.feeds_limit.to_i
77 )
78 render_feed(entries, :title => l(:label_spent_time))
69 render_feed(entries, :title => l(:label_spent_time))
79 }
70 }
80 format.csv {
71 format.csv {
81 # Export all entries
72 # Export all entries
82 @entries = scope.all
73 @entries = scope.all
83 send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
74 send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
84 }
75 }
85 end
76 end
86 end
77 end
87
78
88 def report
79 def report
89 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
80 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
90 scope = time_entry_scope
81 scope = time_entry_scope
91
82
92 @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], scope)
83 @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], scope)
93
84
94 respond_to do |format|
85 respond_to do |format|
95 format.html { render :layout => !request.xhr? }
86 format.html { render :layout => !request.xhr? }
96 format.csv { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
87 format.csv { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
97 end
88 end
98 end
89 end
99
90
100 def show
91 def show
101 respond_to do |format|
92 respond_to do |format|
102 # TODO: Implement html response
93 # TODO: Implement html response
103 format.html { render :nothing => true, :status => 406 }
94 format.html { render :nothing => true, :status => 406 }
104 format.api
95 format.api
105 end
96 end
106 end
97 end
107
98
108 def new
99 def new
109 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
100 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
110 @time_entry.safe_attributes = params[:time_entry]
101 @time_entry.safe_attributes = params[:time_entry]
111 end
102 end
112
103
113 def create
104 def create
114 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
105 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
115 @time_entry.safe_attributes = params[:time_entry]
106 @time_entry.safe_attributes = params[:time_entry]
116
107
117 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
108 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
118
109
119 if @time_entry.save
110 if @time_entry.save
120 respond_to do |format|
111 respond_to do |format|
121 format.html {
112 format.html {
122 flash[:notice] = l(:notice_successful_create)
113 flash[:notice] = l(:notice_successful_create)
123 if params[:continue]
114 if params[:continue]
124 if params[:project_id]
115 if params[:project_id]
125 options = {
116 options = {
126 :time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
117 :time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
127 :back_url => params[:back_url]
118 :back_url => params[:back_url]
128 }
119 }
129 if @time_entry.issue
120 if @time_entry.issue
130 redirect_to new_project_issue_time_entry_path(@time_entry.project, @time_entry.issue, options)
121 redirect_to new_project_issue_time_entry_path(@time_entry.project, @time_entry.issue, options)
131 else
122 else
132 redirect_to new_project_time_entry_path(@time_entry.project, options)
123 redirect_to new_project_time_entry_path(@time_entry.project, options)
133 end
124 end
134 else
125 else
135 options = {
126 options = {
136 :time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
127 :time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
137 :back_url => params[:back_url]
128 :back_url => params[:back_url]
138 }
129 }
139 redirect_to new_time_entry_path(options)
130 redirect_to new_time_entry_path(options)
140 end
131 end
141 else
132 else
142 redirect_back_or_default project_time_entries_path(@time_entry.project)
133 redirect_back_or_default project_time_entries_path(@time_entry.project)
143 end
134 end
144 }
135 }
145 format.api { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
136 format.api { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
146 end
137 end
147 else
138 else
148 respond_to do |format|
139 respond_to do |format|
149 format.html { render :action => 'new' }
140 format.html { render :action => 'new' }
150 format.api { render_validation_errors(@time_entry) }
141 format.api { render_validation_errors(@time_entry) }
151 end
142 end
152 end
143 end
153 end
144 end
154
145
155 def edit
146 def edit
156 @time_entry.safe_attributes = params[:time_entry]
147 @time_entry.safe_attributes = params[:time_entry]
157 end
148 end
158
149
159 def update
150 def update
160 @time_entry.safe_attributes = params[:time_entry]
151 @time_entry.safe_attributes = params[:time_entry]
161
152
162 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
153 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
163
154
164 if @time_entry.save
155 if @time_entry.save
165 respond_to do |format|
156 respond_to do |format|
166 format.html {
157 format.html {
167 flash[:notice] = l(:notice_successful_update)
158 flash[:notice] = l(:notice_successful_update)
168 redirect_back_or_default project_time_entries_path(@time_entry.project)
159 redirect_back_or_default project_time_entries_path(@time_entry.project)
169 }
160 }
170 format.api { render_api_ok }
161 format.api { render_api_ok }
171 end
162 end
172 else
163 else
173 respond_to do |format|
164 respond_to do |format|
174 format.html { render :action => 'edit' }
165 format.html { render :action => 'edit' }
175 format.api { render_validation_errors(@time_entry) }
166 format.api { render_validation_errors(@time_entry) }
176 end
167 end
177 end
168 end
178 end
169 end
179
170
180 def bulk_edit
171 def bulk_edit
181 @available_activities = TimeEntryActivity.shared.active
172 @available_activities = TimeEntryActivity.shared.active
182 @custom_fields = TimeEntry.first.available_custom_fields
173 @custom_fields = TimeEntry.first.available_custom_fields
183 end
174 end
184
175
185 def bulk_update
176 def bulk_update
186 attributes = parse_params_for_bulk_time_entry_attributes(params)
177 attributes = parse_params_for_bulk_time_entry_attributes(params)
187
178
188 unsaved_time_entry_ids = []
179 unsaved_time_entry_ids = []
189 @time_entries.each do |time_entry|
180 @time_entries.each do |time_entry|
190 time_entry.reload
181 time_entry.reload
191 time_entry.safe_attributes = attributes
182 time_entry.safe_attributes = attributes
192 call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
183 call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
193 unless time_entry.save
184 unless time_entry.save
194 logger.info "time entry could not be updated: #{time_entry.errors.full_messages}" if logger && logger.info
185 logger.info "time entry could not be updated: #{time_entry.errors.full_messages}" if logger && logger.info
195 # Keep unsaved time_entry ids to display them in flash error
186 # Keep unsaved time_entry ids to display them in flash error
196 unsaved_time_entry_ids << time_entry.id
187 unsaved_time_entry_ids << time_entry.id
197 end
188 end
198 end
189 end
199 set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
190 set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
200 redirect_back_or_default project_time_entries_path(@projects.first)
191 redirect_back_or_default project_time_entries_path(@projects.first)
201 end
192 end
202
193
203 def destroy
194 def destroy
204 destroyed = TimeEntry.transaction do
195 destroyed = TimeEntry.transaction do
205 @time_entries.each do |t|
196 @time_entries.each do |t|
206 unless t.destroy && t.destroyed?
197 unless t.destroy && t.destroyed?
207 raise ActiveRecord::Rollback
198 raise ActiveRecord::Rollback
208 end
199 end
209 end
200 end
210 end
201 end
211
202
212 respond_to do |format|
203 respond_to do |format|
213 format.html {
204 format.html {
214 if destroyed
205 if destroyed
215 flash[:notice] = l(:notice_successful_delete)
206 flash[:notice] = l(:notice_successful_delete)
216 else
207 else
217 flash[:error] = l(:notice_unable_delete_time_entry)
208 flash[:error] = l(:notice_unable_delete_time_entry)
218 end
209 end
219 redirect_back_or_default project_time_entries_path(@projects.first)
210 redirect_back_or_default project_time_entries_path(@projects.first)
220 }
211 }
221 format.api {
212 format.api {
222 if destroyed
213 if destroyed
223 render_api_ok
214 render_api_ok
224 else
215 else
225 render_validation_errors(@time_entries)
216 render_validation_errors(@time_entries)
226 end
217 end
227 }
218 }
228 end
219 end
229 end
220 end
230
221
231 private
222 private
232 def find_time_entry
223 def find_time_entry
233 @time_entry = TimeEntry.find(params[:id])
224 @time_entry = TimeEntry.find(params[:id])
234 unless @time_entry.editable_by?(User.current)
225 unless @time_entry.editable_by?(User.current)
235 render_403
226 render_403
236 return false
227 return false
237 end
228 end
238 @project = @time_entry.project
229 @project = @time_entry.project
239 rescue ActiveRecord::RecordNotFound
230 rescue ActiveRecord::RecordNotFound
240 render_404
231 render_404
241 end
232 end
242
233
243 def find_time_entries
234 def find_time_entries
244 @time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids])
235 @time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids])
245 raise ActiveRecord::RecordNotFound if @time_entries.empty?
236 raise ActiveRecord::RecordNotFound if @time_entries.empty?
246 @projects = @time_entries.collect(&:project).compact.uniq
237 @projects = @time_entries.collect(&:project).compact.uniq
247 @project = @projects.first if @projects.size == 1
238 @project = @projects.first if @projects.size == 1
248 rescue ActiveRecord::RecordNotFound
239 rescue ActiveRecord::RecordNotFound
249 render_404
240 render_404
250 end
241 end
251
242
252 def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
243 def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
253 if unsaved_time_entry_ids.empty?
244 if unsaved_time_entry_ids.empty?
254 flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
245 flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
255 else
246 else
256 flash[:error] = l(:notice_failed_to_save_time_entries,
247 flash[:error] = l(:notice_failed_to_save_time_entries,
257 :count => unsaved_time_entry_ids.size,
248 :count => unsaved_time_entry_ids.size,
258 :total => time_entries.size,
249 :total => time_entries.size,
259 :ids => '#' + unsaved_time_entry_ids.join(', #'))
250 :ids => '#' + unsaved_time_entry_ids.join(', #'))
260 end
251 end
261 end
252 end
262
253
263 def find_optional_project_for_new_time_entry
254 def find_optional_project_for_new_time_entry
264 if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
255 if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
265 @project = Project.find(project_id)
256 @project = Project.find(project_id)
266 end
257 end
267 if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
258 if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
268 @issue = Issue.find(issue_id)
259 @issue = Issue.find(issue_id)
269 @project ||= @issue.project
260 @project ||= @issue.project
270 end
261 end
271 rescue ActiveRecord::RecordNotFound
262 rescue ActiveRecord::RecordNotFound
272 render_404
263 render_404
273 end
264 end
274
265
275 def find_project_for_new_time_entry
266 def find_project_for_new_time_entry
276 find_optional_project_for_new_time_entry
267 find_optional_project_for_new_time_entry
277 if @project.nil?
268 if @project.nil?
278 render_404
269 render_404
279 end
270 end
280 end
271 end
281
272
282 def find_optional_project
273 def find_optional_project
283 if !params[:issue_id].blank?
274 if !params[:issue_id].blank?
284 @issue = Issue.find(params[:issue_id])
275 @issue = Issue.find(params[:issue_id])
285 @project = @issue.project
276 @project = @issue.project
286 elsif !params[:project_id].blank?
277 elsif !params[:project_id].blank?
287 @project = Project.find(params[:project_id])
278 @project = Project.find(params[:project_id])
288 end
279 end
289 end
280 end
290
281
291 # Returns the TimeEntry scope for index and report actions
282 # Returns the TimeEntry scope for index and report actions
292 def time_entry_scope(options={})
283 def time_entry_scope(options={})
293 scope = @query.results_scope(options)
284 scope = @query.results_scope(options)
294 if @issue
285 if @issue
295 scope = scope.on_issue(@issue)
286 scope = scope.on_issue(@issue)
296 elsif @project
287 elsif @project
297 scope = scope.on_project(@project, Setting.display_subprojects_issues?)
288 scope = scope.on_project(@project, Setting.display_subprojects_issues?)
298 end
289 end
299 scope
290 scope
300 end
291 end
301
292
302 def parse_params_for_bulk_time_entry_attributes(params)
293 def parse_params_for_bulk_time_entry_attributes(params)
303 attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
294 attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
304 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
295 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
305 attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
296 attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
306 attributes
297 attributes
307 end
298 end
308 end
299 end
General Comments 0
You need to be logged in to leave comments. Login now