diff options
| author | David Piegza <david.piegza@mailbox.org> | 2017-02-20 20:01:37 +0300 |
|---|---|---|
| committer | David Piegza <david.piegza@mailbox.org> | 2017-02-21 17:15:01 +0300 |
| commit | 3f7b7a3b0f2199c56b9f5acab07539610ae10c7c (patch) | |
| tree | 5cf4829900eaf8eea466787cee58fe88160f893a /app | |
| parent | 2338ac73ad1aec7a2daf76bc1486e1da70fc879e (diff) | |
Fix preselected namespace when creating a project
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/namespaces_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb index 0676767d910..dc5ae8edbb2 100644 --- a/app/helpers/namespaces_helper.rb +++ b/app/helpers/namespaces_helper.rb @@ -1,4 +1,8 @@ module NamespacesHelper + def namespace_id_from(params) + params.dig(:project, :namespace_id) || params[:namespace_id] + end + def namespaces_options(selected = :current_user, display_path: false, extra_group: nil) groups = current_user.owned_groups + current_user.masters_groups diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index a07885537b9..2a98bba05ee 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -22,7 +22,7 @@ - if current_user.can_select_namespace? .input-group-addon = root_url - = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user, display_path: true), {}, {class: 'select2 js-select-namespace', tabindex: 1} + = f.select :namespace_id, namespaces_options(namespace_id_from(params) || :current_user, display_path: true), {}, {class: 'select2 js-select-namespace', tabindex: 1} - else .input-group-addon.static-namespace |