Commit cc52d475 authored by Felipe Artur's avatar Felipe Artur Committed by Yorick Peterse

Improve code

parent a33095d4
...@@ -21,10 +21,10 @@ class Groups::MilestonesController < Groups::ApplicationController ...@@ -21,10 +21,10 @@ class Groups::MilestonesController < Groups::ApplicationController
project_ids = params[:milestone][:project_ids].reject(&:blank?) project_ids = params[:milestone][:project_ids].reject(&:blank?)
title = milestone_params[:title] title = milestone_params[:title]
if project_ids.present? if create_milestones(project_ids, title)
create_milestones(project_ids, title) redirect_to milestone_path(title)
else else
render_new_with_error("Select a project(s).") render_new_with_error(@error)
end end
end end
...@@ -42,14 +42,22 @@ class Groups::MilestonesController < Groups::ApplicationController ...@@ -42,14 +42,22 @@ class Groups::MilestonesController < Groups::ApplicationController
private private
def create_milestones(project_ids, title) def create_milestones(project_ids, title)
unless project_ids.present?
@error = "Please select at least one project."
return false
end
begin begin
@projects.where(id: project_ids).each do |project| ActiveRecord::Base.transaction do
ActiveRecord::Base.transaction { Milestones::CreateService.new(project, current_user, milestone_params).execute } @projects.where(id: project_ids).each do |project|
Milestones::CreateService.new(project, current_user, milestone_params).execute
end
end end
redirect_to milestone_path(title) true
rescue => e rescue => e
render_new_with_error("Error creating milestones: #{e.message}") @error = "Error creating milestone: #{e.message}."
false
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment