d800a949d2
Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 Fix constraints
55 lines
1.3 KiB
Ruby
55 lines
1.3 KiB
Ruby
class Groups::MilestonesController < Groups::ApplicationController
|
|
include GlobalMilestones
|
|
|
|
before_action :projects
|
|
before_action :milestones, only: [:index]
|
|
before_action :milestone, only: [:show, :update]
|
|
before_action :authorize_group_milestone!, only: [:create, :update]
|
|
|
|
def index
|
|
end
|
|
|
|
def new
|
|
@milestone = Milestone.new
|
|
end
|
|
|
|
def create
|
|
project_ids = params[:milestone][:project_ids]
|
|
title = milestone_params[:title]
|
|
|
|
@group.projects.where(id: project_ids).each do |project|
|
|
Milestones::CreateService.new(project, current_user, milestone_params).execute
|
|
end
|
|
|
|
redirect_to milestone_path(title)
|
|
end
|
|
|
|
def show
|
|
end
|
|
|
|
def update
|
|
@milestone.milestones.each do |milestone|
|
|
Milestones::UpdateService.new(milestone.project, current_user, milestone_params).execute(milestone)
|
|
end
|
|
|
|
redirect_back_or_default(default: milestone_path(@milestone.title))
|
|
end
|
|
|
|
private
|
|
|
|
def authorize_group_milestone!
|
|
return render_404 unless can?(current_user, :admin_milestones, group)
|
|
end
|
|
|
|
def milestone_params
|
|
params.require(:milestone).permit(:title, :description, :due_date, :state_event)
|
|
end
|
|
|
|
def milestone_path(title)
|
|
group_milestone_path(@group, title.to_slug.to_s, title: title)
|
|
end
|
|
|
|
def projects
|
|
@projects ||= @group.projects
|
|
end
|
|
end
|