diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-04-04 17:04:35 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-04-05 11:53:39 -0300 |
commit | 32c7e42b612bdda43eeef55d8c8afdc9eeb33785 (patch) | |
tree | 249f53f853e45ad2ed529e5fd53970b9ba5b8390 /app/controllers/groups/milestones_controller.rb | |
parent | 5d428030451b1fa2bac89f798c40d2f91ac65bac (diff) | |
download | gitlab-ce-32c7e42b612bdda43eeef55d8c8afdc9eeb33785.tar.gz |
Improve code
Diffstat (limited to 'app/controllers/groups/milestones_controller.rb')
-rw-r--r-- | app/controllers/groups/milestones_controller.rb | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 21fc329f233..fcf19e8066a 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -24,7 +24,7 @@ class Groups::MilestonesController < Groups::ApplicationController if create_milestones(project_ids, title) redirect_to milestone_path(title) else - render_new_with_error(@error) + render_new_with_error(project_ids.empty?) end end @@ -42,28 +42,25 @@ class Groups::MilestonesController < Groups::ApplicationController private def create_milestones(project_ids, title) - unless project_ids.present? - @error = "Please select at least one project." - return false - end + return false unless project_ids.present? - begin - ActiveRecord::Base.transaction do - @projects.where(id: project_ids).each do |project| - Milestones::CreateService.new(project, current_user, milestone_params).execute - end + ActiveRecord::Base.transaction do + @projects.where(id: project_ids).each do |project| + Milestones::CreateService.new(project, current_user, milestone_params).execute end + end + + true - true rescue => e - @error = "Error creating milestone: #{e.message}." - false - end + + flash.now[:alert] = "An error occurred while creating the milestone: #{e.message}" + false end - def render_new_with_error(error) + def render_new_with_error(empty_project_ids) @milestone = Milestone.new(milestone_params) - flash[:alert] = error + @milestone.errors.add(:project_id, "Please select at least one project.") if empty_project_ids render :new end |