diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-15 13:58:15 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-17 09:40:41 +0200 |
| commit | 87f082de455c784a6beb5d7005a564cfbf8c6bf9 (patch) | |
| tree | 4d79500c5f1831ca92073e66b78d2b713430d419 | |
| parent | 36ba84cb94dd377a9995b5cdaba9021974fc0489 (diff) | |
| download | gitlab-ce-87f082de455c784a6beb5d7005a564cfbf8c6bf9.tar.gz | |
Frontend to send template name instead of on/off
The params were not getting a value other than `project_templates:"on"`
so the backend wasn't sure what template to use.
Fixes gitlab-org/gitlab-ce#36492
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/_project_templates.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 1d24563a6a6..150bd591f21 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -28,7 +28,7 @@ class ProjectsController < Projects::ApplicationController end def create - @project = ::Projects::CreateService.new(current_user, project_params).execute + @project = ::Projects::CreateService.new(current_user, project_params.merge(template_name: params[:template_name])).execute if @project.saved? cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) } diff --git a/app/views/projects/_project_templates.html.haml b/app/views/projects/_project_templates.html.haml index 21baf35f2ac..97cf13df070 100644 --- a/app/views/projects/_project_templates.html.haml +++ b/app/views/projects/_project_templates.html.haml @@ -5,6 +5,6 @@ Blank - Gitlab::ProjectTemplate.all.each do |template| .btn - %input{ type: "radio", autocomplete: "off", name: "project_templates", id: template.name } + %input{ type: "radio", autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name } = custom_icon(template.logo) = template.title diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index d3d7915bebf..baf3d29e6c5 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -18,7 +18,7 @@ feature 'Project' do click_button "Create project" end - expect(page).to have_content 'This project Loading..' + expect(page).to have_content template.name end end |