Allow group path renaming. Dont show project transfer if no permissions. More danger messages :)

Dmitriy Zaporozhets
1 parent a8fbda94
Showing 4 changed files with 46 additions and 23 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/views/admin/groups/edit.html.haml
app/views/admin/groups/show.html.haml
app/views/projects/_form.html.haml
@@ -100,6 +100,12 @@ input[type=&#39;search&#39;].search-text-input {
   border: 1px solid #ccc;
 }
  
+input[type='text'].danger {
+  background: #F2DEDE!important;
+  border-color: #D66;
+  text-shadow: 0 1px 1px #fff
+}
+
 fieldset legend { font-size: 17px; }
  
 /** PAGINATION **/
 %h3.page_title Rename Group
 %hr
-.alert
-  Renaming group can have unintended side effects.
-  %br
-  Renaming group will rename directory for all related projects
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
     .alert-message.block-message.error
@@ -14,6 +10,19 @@
     .input
       = f.text_field :name, placeholder: "Example Group", class: "xxlarge"
  
+
+
+  .clearfix.group_name_holder
+    = f.label :path do
+      %span.cred Group path is
+    .input
+      = f.text_field :path, placeholder: "example-group", class: "xxlarge danger"
+      %ul.cred
+        %li Changing group path can have unintended side effects.
+        %li Renaming group path will rename directory for all related projects
+        %li It will change web url for access group and group projects.
+        %li It will change the git path to repositories under this group.
+
   .form-actions
-    = f.submit 'Rename group', class: "btn save-btn"
+    = f.submit 'Rename group', class: "btn danger"
     = link_to  'Cancel', admin_groups_path, class: "btn cancel-btn"
@@ -33,12 +33,17 @@
         = link_to "#", class: "btn btn-small change-owner-link" do
           %i.icon-edit
           Change owner
-        .change-owner-holder.hide
-          = form_for [:admin, @group] do |f|
-            = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'}
-            = f.submit 'Save', class: "btn btn-small save-btn"
-            = link_to "Cancel", "#", class: "btn btn-small change-owner-cancel-link"
  
+  %tr.change-owner-holder.hide
+    %td.bgred
+      %b.cred
+        New Owner:
+    %td.bgred
+      = form_for [:admin, @group] do |f|
+        = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'}
+        %div
+          = f.submit 'Change Owner', class: "btn danger"
+          = link_to "Cancel", "#", class: "btn change-owner-cancel-link"
 %fieldset
   %legend Projects (#{@group.projects.count})
   %table
@@ -17,19 +17,6 @@
       .controls
         = text_field_tag :ppath, @project.path_to_repo, class: "xxlarge", readonly: true
  
-    .control-group
-      = f.label :namespace_id do
-        %span Namespace
-      .controls
-        - if can? current_user, :change_namespace, @project
-          = f.select :namespace_id, namespaces_options(@project.namespace_id || Namespace::global_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
-          &nbsp;
-          %span.cred Be careful. Changing project namespace can have unintended side effects
-        - else
-          %a.btn.disabled= @project.namespace.try(:human_name) || "/"
-          &nbsp;
-          %span.cred Only owner can change project namespace.
-
  
     - unless @project.heads.empty?
       .clearfix
@@ -63,6 +50,22 @@
         = f.check_box :wiki_enabled
         %span.descr Pages for project documentation
  
+
+  - if can? current_user, :change_namespace, @project
+    %fieldset.features
+      %legend Transfer:
+      .control-group
+        = f.label :namespace_id do
+          %span Namespace
+        .controls
+          = f.select :namespace_id, namespaces_options(@project.namespace_id || Namespace::global_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
+          %br
+          %ul.prepend-top-10.cred
+            %li Be careful. Changing project namespace can have unintended side effects
+            %li You can transfer project only to namespaces you can manage
+            %li You will need to update your local repositories to point to the new location.
+
+
   %br
  
   .actions
...	...	@@ -100,6 +100,12 @@ input[type='search'].search-text-input {
100	100	border: 1px solid #ccc;
101	101	}
102	102
	103	+input[type='text'].danger {
	104	+ background: #F2DEDE!important;
	105	+ border-color: #D66;
	106	+ text-shadow: 0 1px 1px #fff
	107	+}
	108	+
103	109	fieldset legend { font-size: 17px; }
104	110
105	111	/ PAGINATION /
...	...
1	1	%h3.page_title Rename Group
2	2	%hr
3		-.alert
4		- Renaming group can have unintended side effects.
5		- %br
6		- Renaming group will rename directory for all related projects
7	3	= form_for [:admin, @group] do \|f\|
8	4	- if @group.errors.any?
9	5	.alert-message.block-message.error
...	...	@@ -14,6 +10,19 @@
14	10	.input
15	11	= f.text_field :name, placeholder: "Example Group", class: "xxlarge"
16	12
	13	+
	14	+
	15	+ .clearfix.group_name_holder
	16	+ = f.label :path do
	17	+ %span.cred Group path is
	18	+ .input
	19	+ = f.text_field :path, placeholder: "example-group", class: "xxlarge danger"
	20	+ %ul.cred
	21	+ %li Changing group path can have unintended side effects.
	22	+ %li Renaming group path will rename directory for all related projects
	23	+ %li It will change web url for access group and group projects.
	24	+ %li It will change the git path to repositories under this group.
	25	+
17	26	.form-actions
18		- = f.submit 'Rename group', class: "btn save-btn"
	27	+ = f.submit 'Rename group', class: "btn danger"
19	28	= link_to 'Cancel', admin_groups_path, class: "btn cancel-btn"
...	...
...	...	@@ -33,12 +33,17 @@
33	33	= link_to "#", class: "btn btn-small change-owner-link" do
34	34	%i.icon-edit
35	35	Change owner
36		- .change-owner-holder.hide
37		- = form_for [:admin, @group] do \|f\|
38		- = f.select :owner_id, User.all.map { \|user\| [user.name, user.id] }, {}, {class: 'chosen'}
39		- = f.submit 'Save', class: "btn btn-small save-btn"
40		- = link_to "Cancel", "#", class: "btn btn-small change-owner-cancel-link"
41	36
	37	+ %tr.change-owner-holder.hide
	38	+ %td.bgred
	39	+ %b.cred
	40	+ New Owner:
	41	+ %td.bgred
	42	+ = form_for [:admin, @group] do \|f\|
	43	+ = f.select :owner_id, User.all.map { \|user\| [user.name, user.id] }, {}, {class: 'chosen'}
	44	+ %div
	45	+ = f.submit 'Change Owner', class: "btn danger"
	46	+ = link_to "Cancel", "#", class: "btn change-owner-cancel-link"
42	47	%fieldset
43	48	%legend Projects (#{@group.projects.count})
44	49	%table
...	...
...	...	@@ -17,19 +17,6 @@
17	17	.controls
18	18	= text_field_tag :ppath, @project.path_to_repo, class: "xxlarge", readonly: true
19	19
20		- .control-group
21		- = f.label :namespace_id do
22		- %span Namespace
23		- .controls
24		- - if can? current_user, :change_namespace, @project
25		- = f.select :namespace_id, namespaces_options(@project.namespace_id \|\| Namespace::global_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
26		-
27		- %span.cred Be careful. Changing project namespace can have unintended side effects
28		- - else
29		- %a.btn.disabled= @project.namespace.try(:human_name) \|\| "/"
30		-
31		- %span.cred Only owner can change project namespace.
32		-
33	20
34	21	- unless @project.heads.empty?
35	22	.clearfix
...	...	@@ -63,6 +50,22 @@
63	50	= f.check_box :wiki_enabled
64	51	%span.descr Pages for project documentation
65	52
	53	+
	54	+ - if can? current_user, :change_namespace, @project
	55	+ %fieldset.features
	56	+ %legend Transfer:
	57	+ .control-group
	58	+ = f.label :namespace_id do
	59	+ %span Namespace
	60	+ .controls
	61	+ = f.select :namespace_id, namespaces_options(@project.namespace_id \|\| Namespace::global_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
	62	+ %br
	63	+ %ul.prepend-top-10.cred
	64	+ %li Be careful. Changing project namespace can have unintended side effects
	65	+ %li You can transfer project only to namespaces you can manage
	66	+ %li You will need to update your local repositories to point to the new location.
	67	+
	68	+
66	69	%br
67	70
68	71	.actions
...	...