annotate app/controllers/issues_controller.rb @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents c86dacc2ef0a
children a1bdbf8a87d5
rev   line source
Chris@0 1 # Redmine - project management software
Chris@1494 2 # Copyright (C) 2006-2014 Jean-Philippe Lang
Chris@0 3 #
Chris@0 4 # This program is free software; you can redistribute it and/or
Chris@0 5 # modify it under the terms of the GNU General Public License
Chris@0 6 # as published by the Free Software Foundation; either version 2
Chris@0 7 # of the License, or (at your option) any later version.
Chris@441 8 #
Chris@0 9 # This program is distributed in the hope that it will be useful,
Chris@0 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@0 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@0 12 # GNU General Public License for more details.
Chris@441 13 #
Chris@0 14 # You should have received a copy of the GNU General Public License
Chris@0 15 # along with this program; if not, write to the Free Software
Chris@0 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@0 17
Chris@0 18 class IssuesController < ApplicationController
Chris@0 19 menu_item :new_issue, :only => [:new, :create]
Chris@0 20 default_search_scope :issues
Chris@441 21
Chris@14 22 before_filter :find_issue, :only => [:show, :edit, :update]
Chris@1115 23 before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
Chris@1464 24 before_filter :find_project, :only => [:new, :create, :update_form]
Chris@14 25 before_filter :authorize, :except => [:index]
Chris@14 26 before_filter :find_optional_project, :only => [:index]
Chris@0 27 before_filter :check_for_default_issue_status, :only => [:new, :create]
Chris@1464 28 before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
Chris@507 29 accept_rss_auth :index, :show
Chris@507 30 accept_api_auth :index, :show, :create, :update, :destroy
Chris@0 31
Chris@0 32 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
Chris@441 33
Chris@0 34 helper :journals
Chris@0 35 helper :projects
Chris@441 36 include ProjectsHelper
Chris@0 37 helper :custom_fields
Chris@0 38 include CustomFieldsHelper
Chris@0 39 helper :issue_relations
Chris@0 40 include IssueRelationsHelper
Chris@0 41 helper :watchers
Chris@0 42 include WatchersHelper
Chris@0 43 helper :attachments
Chris@0 44 include AttachmentsHelper
Chris@0 45 helper :queries
Chris@0 46 include QueriesHelper
Chris@117 47 helper :repositories
Chris@117 48 include RepositoriesHelper
Chris@0 49 helper :sort
Chris@0 50 include SortHelper
Chris@0 51 include IssuesHelper
Chris@0 52 helper :timelog
Chris@0 53 include Redmine::Export::PDF
Chris@0 54
Chris@0 55 def index
Chris@0 56 retrieve_query
Chris@0 57 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
Chris@0 58 sort_update(@query.sortable_columns)
Chris@1115 59 @query.sort_criteria = sort_criteria.to_a
Chris@441 60
Chris@0 61 if @query.valid?
Chris@117 62 case params[:format]
Chris@0 63 when 'csv', 'pdf'
Chris@117 64 @limit = Setting.issues_export_limit.to_i
Chris@0 65 when 'atom'
Chris@117 66 @limit = Setting.feeds_limit.to_i
Chris@117 67 when 'xml', 'json'
Chris@117 68 @offset, @limit = api_offset_and_limit
Chris@0 69 else
Chris@117 70 @limit = per_page_option
Chris@0 71 end
Chris@441 72
Chris@0 73 @issue_count = @query.issue_count
Chris@1464 74 @issue_pages = Paginator.new @issue_count, @limit, params['page']
Chris@1464 75 @offset ||= @issue_pages.offset
Chris@0 76 @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
Chris@441 77 :order => sort_clause,
Chris@441 78 :offset => @offset,
Chris@117 79 :limit => @limit)
Chris@0 80 @issue_count_by_group = @query.issue_count_by_group
Chris@441 81
Chris@0 82 respond_to do |format|
Chris@909 83 format.html { render :template => 'issues/index', :layout => !request.xhr? }
Chris@909 84 format.api {
Chris@1115 85 Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
Chris@909 86 }
Chris@0 87 format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
Chris@1464 88 format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') }
Chris@1464 89 format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') }
Chris@0 90 end
Chris@0 91 else
Chris@909 92 respond_to do |format|
Chris@909 93 format.html { render(:template => 'issues/index', :layout => !request.xhr?) }
Chris@909 94 format.any(:atom, :csv, :pdf) { render(:nothing => true) }
Chris@909 95 format.api { render_validation_errors(@query) }
Chris@909 96 end
Chris@0 97 end
Chris@0 98 rescue ActiveRecord::RecordNotFound
Chris@0 99 render_404
Chris@0 100 end
Chris@441 101
Chris@0 102 def show
Chris@1115 103 @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
Chris@0 104 @journals.each_with_index {|j,i| j.indice = i+1}
Chris@1115 105 @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
Chris@1464 106 Journal.preload_journals_details_custom_fields(@journals)
Chris@1464 107 # TODO: use #select! when ruby1.8 support is dropped
Chris@1464 108 @journals.reject! {|journal| !journal.notes? && journal.visible_details.empty?}
Chris@0 109 @journals.reverse! if User.current.wants_comments_in_reverse_order?
Chris@441 110
Chris@1115 111 @changesets = @issue.changesets.visible.all
Chris@1115 112 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
Chris@441 113
Chris@210 114 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
Chris@0 115 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
Chris@0 116 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
Chris@909 117 @priorities = IssuePriority.active
Chris@441 118 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
Chris@1464 119 @relation = IssueRelation.new
Chris@1464 120
Chris@0 121 respond_to do |format|
Chris@1115 122 format.html {
Chris@1115 123 retrieve_previous_and_next_issue_ids
Chris@1115 124 render :template => 'issues/show'
Chris@1115 125 }
Chris@117 126 format.api
Chris@14 127 format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
Chris@1115 128 format.pdf {
Chris@1115 129 pdf = issue_to_pdf(@issue, :journals => @journals)
Chris@1115 130 send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
Chris@1115 131 }
Chris@0 132 end
Chris@0 133 end
Chris@0 134
Chris@0 135 # Add a new issue
Chris@0 136 # The new issue will be created from an existing one if copy_from parameter is given
Chris@0 137 def new
Chris@14 138 respond_to do |format|
Chris@14 139 format.html { render :action => 'new', :layout => !request.xhr? }
Chris@14 140 end
Chris@0 141 end
Chris@0 142
Chris@0 143 def create
Chris@0 144 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
Chris@1115 145 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
Chris@0 146 if @issue.save
luisf@70 147
Chris@0 148 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
luisf@70 149
luisf@71 150 # Also adds the assignee to the watcher's list
chris@1142 151 if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?
chris@1142 152 unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id])
luisf@141 153 @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
luisf@141 154 end
luisf@141 155 end
luisf@71 156
Chris@0 157 respond_to do |format|
Chris@0 158 format.html {
Chris@909 159 render_attachment_warning_if_needed(@issue)
Chris@1115 160 flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
Chris@1464 161 if params[:continue]
Chris@1464 162 attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
Chris@1464 163 redirect_to new_project_issue_path(@issue.project, :issue => attrs)
Chris@1464 164 else
Chris@1464 165 redirect_to issue_path(@issue)
Chris@1464 166 end
Chris@0 167 }
Chris@117 168 format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
Chris@0 169 end
Chris@0 170 return
Chris@0 171 else
Chris@0 172 respond_to do |format|
Chris@0 173 format.html { render :action => 'new' }
Chris@117 174 format.api { render_validation_errors(@issue) }
Chris@0 175 end
Chris@0 176 end
Chris@0 177 end
Chris@441 178
Chris@0 179 def edit
Chris@1115 180 return unless update_issue_from_params
Chris@0 181
Chris@0 182 respond_to do |format|
Chris@0 183 format.html { }
Chris@0 184 format.xml { }
Chris@0 185 end
Chris@0 186 end
Chris@0 187
Chris@0 188 def update
Chris@1115 189 return unless update_issue_from_params
Chris@1115 190 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
Chris@1115 191 saved = false
Chris@1115 192 begin
Chris@1464 193 saved = save_issue_with_child_records
Chris@1115 194 rescue ActiveRecord::StaleObjectError
Chris@1115 195 @conflict = true
Chris@1115 196 if params[:last_journal_id]
Chris@1115 197 @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
Chris@1115 198 @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
Chris@1115 199 end
Chris@1115 200 end
Chris@0 201
Chris@1115 202 if saved
Chris@0 203 render_attachment_warning_if_needed(@issue)
Chris@0 204 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
Chris@0 205
Chris@0 206 respond_to do |format|
Chris@1464 207 format.html { redirect_back_or_default issue_path(@issue) }
Chris@1115 208 format.api { render_api_ok }
Chris@0 209 end
Chris@0 210 else
Chris@0 211 respond_to do |format|
Chris@0 212 format.html { render :action => 'edit' }
Chris@117 213 format.api { render_validation_errors(@issue) }
Chris@0 214 end
Chris@0 215 end
Chris@0 216 end
Chris@0 217
Chris@1464 218 # Updates the issue form when changing the project, status or tracker
Chris@1464 219 # on issue creation/update
Chris@1464 220 def update_form
Chris@1464 221 end
Chris@1464 222
Chris@1115 223 # Bulk edit/copy a set of issues
Chris@0 224 def bulk_edit
Chris@0 225 @issues.sort!
Chris@1115 226 @copy = params[:copy].present?
Chris@1115 227 @notes = params[:notes]
Chris@1115 228
Chris@1115 229 if User.current.allowed_to?(:move_issues, @projects)
Chris@1115 230 @allowed_projects = Issue.allowed_target_projects_on_move
Chris@1115 231 if params[:issue]
Chris@1115 232 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
Chris@1115 233 if @target_project
Chris@1115 234 target_projects = [@target_project]
Chris@1115 235 end
Chris@1115 236 end
Chris@1115 237 end
Chris@1115 238 target_projects ||= @projects
Chris@1115 239
Chris@1115 240 if @copy
Chris@1115 241 @available_statuses = [IssueStatus.default]
Chris@1115 242 else
Chris@1115 243 @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
Chris@1115 244 end
Chris@1464 245 @custom_fields = target_projects.map{|p|p.all_issue_custom_fields.visible}.reduce(:&)
Chris@1115 246 @assignables = target_projects.map(&:assignable_users).reduce(:&)
Chris@1115 247 @trackers = target_projects.map(&:trackers).reduce(:&)
Chris@1115 248 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
Chris@1115 249 @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
Chris@1115 250 if @copy
Chris@1115 251 @attachments_present = @issues.detect {|i| i.attachments.any?}.present?
Chris@1115 252 @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
Chris@1115 253 end
Chris@1115 254
Chris@1115 255 @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
Chris@1464 256
Chris@1464 257 @issue_params = params[:issue] || {}
Chris@1464 258 @issue_params[:custom_field_values] ||= {}
Chris@0 259 end
Chris@0 260
Chris@14 261 def bulk_update
Chris@0 262 @issues.sort!
Chris@1115 263 @copy = params[:copy].present?
Chris@14 264 attributes = parse_params_for_bulk_issue_attributes(params)
Chris@14 265
Chris@1464 266 unsaved_issues = []
Chris@1464 267 saved_issues = []
Chris@1115 268
Chris@1115 269 if @copy && params[:copy_subtasks].present?
Chris@1115 270 # Descendant issues will be copied with the parent task
Chris@1115 271 # Don't copy them twice
Chris@1115 272 @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
Chris@1115 273 end
Chris@1115 274
Chris@1464 275 @issues.each do |orig_issue|
Chris@1464 276 orig_issue.reload
Chris@1115 277 if @copy
Chris@1464 278 issue = orig_issue.copy({},
Chris@1115 279 :attachments => params[:copy_attachments].present?,
Chris@1115 280 :subtasks => params[:copy_subtasks].present?
Chris@1115 281 )
Chris@1464 282 else
Chris@1464 283 issue = orig_issue
Chris@1115 284 end
Chris@14 285 journal = issue.init_journal(User.current, params[:notes])
Chris@14 286 issue.safe_attributes = attributes
Chris@14 287 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
Chris@1115 288 if issue.save
Chris@1464 289 saved_issues << issue
Chris@1115 290 else
Chris@1464 291 unsaved_issues << orig_issue
Chris@0 292 end
Chris@0 293 end
Chris@1115 294
Chris@1464 295 if unsaved_issues.empty?
Chris@1464 296 flash[:notice] = l(:notice_successful_update) unless saved_issues.empty?
Chris@1464 297 if params[:follow]
Chris@1464 298 if @issues.size == 1 && saved_issues.size == 1
Chris@1464 299 redirect_to issue_path(saved_issues.first)
Chris@1464 300 elsif saved_issues.map(&:project).uniq.size == 1
Chris@1464 301 redirect_to project_issues_path(saved_issues.map(&:project).first)
Chris@1464 302 end
Chris@1464 303 else
Chris@1464 304 redirect_back_or_default _project_issues_path(@project)
Chris@1115 305 end
Chris@1115 306 else
Chris@1464 307 @saved_issues = @issues
Chris@1464 308 @unsaved_issues = unsaved_issues
Chris@1464 309 @issues = Issue.visible.find_all_by_id(@unsaved_issues.map(&:id))
Chris@1464 310 bulk_edit
Chris@1464 311 render :action => 'bulk_edit'
Chris@1115 312 end
Chris@0 313 end
Chris@441 314
Chris@0 315 def destroy
Chris@1464 316 @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f
Chris@0 317 if @hours > 0
Chris@0 318 case params[:todo]
Chris@0 319 when 'destroy'
Chris@0 320 # nothing to do
Chris@0 321 when 'nullify'
Chris@0 322 TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
Chris@0 323 when 'reassign'
Chris@0 324 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
Chris@0 325 if reassign_to.nil?
Chris@0 326 flash.now[:error] = l(:error_issue_not_found_in_project)
Chris@0 327 return
Chris@0 328 else
Chris@0 329 TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
Chris@0 330 end
Chris@0 331 else
Chris@117 332 # display the destroy form if it's a user request
Chris@117 333 return unless api_request?
Chris@0 334 end
Chris@0 335 end
Chris@441 336 @issues.each do |issue|
Chris@441 337 begin
Chris@441 338 issue.reload.destroy
Chris@441 339 rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
Chris@441 340 # nothing to do, issue was already deleted (eg. by a parent)
Chris@441 341 end
Chris@441 342 end
Chris@0 343 respond_to do |format|
Chris@1464 344 format.html { redirect_back_or_default _project_issues_path(@project) }
Chris@1115 345 format.api { render_api_ok }
Chris@0 346 end
Chris@0 347 end
Chris@0 348
Chris@1115 349 private
Chris@1115 350
Chris@1115 351 def find_project
Chris@1115 352 project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
Chris@1115 353 @project = Project.find(project_id)
Chris@0 354 rescue ActiveRecord::RecordNotFound
Chris@0 355 render_404
Chris@0 356 end
Chris@441 357
Chris@1115 358 def retrieve_previous_and_next_issue_ids
Chris@1115 359 retrieve_query_from_session
Chris@1115 360 if @query
Chris@1115 361 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
Chris@1115 362 sort_update(@query.sortable_columns, 'issues_index_sort')
Chris@1115 363 limit = 500
Chris@1115 364 issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
Chris@1115 365 if (idx = issue_ids.index(@issue.id)) && idx < limit
Chris@1115 366 if issue_ids.size < 500
Chris@1115 367 @issue_position = idx + 1
Chris@1115 368 @issue_count = issue_ids.size
Chris@1115 369 end
Chris@1115 370 @prev_issue_id = issue_ids[idx - 1] if idx > 0
Chris@1115 371 @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
Chris@1115 372 end
Chris@1115 373 end
Chris@0 374 end
Chris@441 375
Chris@0 376 # Used by #edit and #update to set some common instance variables
Chris@0 377 # from the params
Chris@0 378 # TODO: Refactor, not everything in here is needed by #edit
Chris@0 379 def update_issue_from_params
Chris@0 380 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
Chris@441 381 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
chris@37 382 @time_entry.attributes = params[:time_entry]
Chris@441 383
Chris@1115 384 @issue.init_journal(User.current)
Chris@1115 385
Chris@1115 386 issue_attributes = params[:issue]
Chris@1115 387 if issue_attributes && params[:conflict_resolution]
Chris@1115 388 case params[:conflict_resolution]
Chris@1115 389 when 'overwrite'
Chris@1115 390 issue_attributes = issue_attributes.dup
Chris@1115 391 issue_attributes.delete(:lock_version)
Chris@1115 392 when 'add_notes'
Chris@1115 393 issue_attributes = issue_attributes.slice(:notes)
Chris@1115 394 when 'cancel'
Chris@1115 395 redirect_to issue_path(@issue)
Chris@1115 396 return false
Chris@1115 397 end
Chris@1115 398 end
luisf@71 399
luisf@71 400 # tests if the the user assigned_to_id
luisf@71 401 # is in this issues watcher's list
luisf@71 402 # if not, adds it.
luisf@71 403
chris@1142 404 if params[:issue] && params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?
chris@1142 405 unless @issue.watched_by?(User.find(params[:issue][:assigned_to_id]))
luisf@141 406 @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
luisf@141 407 end
luisf@141 408 end
luisf@71 409
Chris@1115 410 @issue.safe_attributes = issue_attributes
Chris@1115 411 @priorities = IssuePriority.active
Chris@1115 412 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
Chris@1115 413 true
luisf@71 414
Chris@0 415 end
Chris@0 416
Chris@0 417 # TODO: Refactor, lots of extra code in here
chris@37 418 # TODO: Changing tracker on an existing issue should not trigger this
Chris@0 419 def build_new_issue_from_params
Chris@14 420 if params[:id].blank?
Chris@14 421 @issue = Issue.new
Chris@1115 422 if params[:copy_from]
Chris@1115 423 begin
Chris@1115 424 @copy_from = Issue.visible.find(params[:copy_from])
Chris@1115 425 @copy_attachments = params[:copy_attachments].present? || request.get?
Chris@1115 426 @copy_subtasks = params[:copy_subtasks].present? || request.get?
Chris@1115 427 @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks)
Chris@1115 428 rescue ActiveRecord::RecordNotFound
Chris@1115 429 render_404
Chris@1115 430 return
Chris@1115 431 end
Chris@1115 432 end
Chris@14 433 @issue.project = @project
Chris@14 434 else
Chris@14 435 @issue = @project.issues.visible.find(params[:id])
Chris@14 436 end
Chris@441 437
Chris@0 438 @issue.project = @project
Chris@1115 439 @issue.author ||= User.current
Chris@0 440 # Tracker must be set before custom field values
Chris@0 441 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
Chris@0 442 if @issue.tracker.nil?
Chris@0 443 render_error l(:error_no_tracker_in_project)
Chris@0 444 return false
Chris@0 445 end
Chris@909 446 @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
Chris@1115 447 @issue.safe_attributes = params[:issue]
Chris@1115 448
Chris@909 449 @priorities = IssuePriority.active
Chris@1464 450 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
Chris@1115 451 @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
Chris@0 452 end
Chris@0 453
Chris@0 454 def check_for_default_issue_status
Chris@0 455 if IssueStatus.default.nil?
Chris@0 456 render_error l(:error_no_default_issue_status)
Chris@0 457 return false
Chris@0 458 end
Chris@0 459 end
Chris@14 460
Chris@14 461 def parse_params_for_bulk_issue_attributes(params)
Chris@14 462 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
Chris@14 463 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
Chris@1115 464 if custom = attributes[:custom_field_values]
Chris@1115 465 custom.reject! {|k,v| v.blank?}
Chris@1115 466 custom.keys.each do |k|
Chris@1115 467 if custom[k].is_a?(Array)
Chris@1115 468 custom[k] << '' if custom[k].delete('__none__')
Chris@1115 469 else
Chris@1115 470 custom[k] = '' if custom[k] == '__none__'
Chris@1115 471 end
Chris@1115 472 end
Chris@1115 473 end
Chris@14 474 attributes
Chris@14 475 end
Chris@1464 476
Chris@1464 477 # Saves @issue and a time_entry from the parameters
Chris@1464 478 def save_issue_with_child_records
Chris@1464 479 Issue.transaction do
Chris@1464 480 if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project)
Chris@1464 481 time_entry = @time_entry || TimeEntry.new
Chris@1464 482 time_entry.project = @issue.project
Chris@1464 483 time_entry.issue = @issue
Chris@1464 484 time_entry.user = User.current
Chris@1464 485 time_entry.spent_on = User.current.today
Chris@1464 486 time_entry.attributes = params[:time_entry]
Chris@1464 487 @issue.time_entries << time_entry
Chris@1464 488 end
Chris@1464 489
Chris@1464 490 call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
Chris@1464 491 if @issue.save
Chris@1464 492 call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
Chris@1464 493 else
Chris@1464 494 raise ActiveRecord::Rollback
Chris@1464 495 end
Chris@1464 496 end
Chris@1464 497 end
Chris@0 498 end