Added ability to manage groups from admin

Dmitriy Zaporozhets
1 parent 010ac2b1
Showing 11 changed files with 26 additions and 7 deletions Show diff stats
app/controllers/admin/groups_controller.rb
app/views/admin/groups/_form.html.haml
app/views/admin/groups/edit.html.haml
app/views/admin/groups/index.html.haml
app/views/admin/groups/show.html.haml
app/views/admin/projects/index.html.haml
app/views/admin/projects/show.html.haml
app/views/admin/shared/_projects_head.html.haml
app/views/groups/_projects.html.haml
app/views/layouts/admin.html.haml
config/routes.rb
@@ -52,6 +52,14 @@ class Admin::GroupsController &lt; AdminController
     redirect_to :back, notice: 'Group was successfully updated.'
   end
  
+  def remove_project
+    @project = Project.find(params[:project_id])
+    @project.group_id = nil
+    @project.save
+
+    redirect_to :back, notice: 'Group was successfully updated.'
+  end
+
   def destroy
     @group.destroy
  
@@ -16,4 +16,4 @@
         = f.text_field :code, placeholder: "example"
  
   .form-actions
-    = f.submit 'Create group', class: "btn primary"
+    = f.submit 'Save group', class: "btn save-btn"
@@ -0,0 +1,3 @@
+%h3.page_title Edit Group
+%br
+= render 'form'
+= render 'admin/shared/projects_head'
 %h3.page_title
   Groups
   = link_to 'New Group', new_admin_group_path, class: "btn small right"
+= render 'admin/shared/projects_head'
 %h3.page_title
   Group: #{@group.name}
   = link_to edit_admin_group_path(@group), class: "btn right" do
@@ -38,6 +39,9 @@
       %li.wll
         %strong
           = link_to project.name, [:admin, project]
+        .right
+          = link_to 'Remove from group', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Are you sure?', method: :delete, class: "btn danger small"
+        .clearfix
  
 %br
 %h3 Add new project
+= render 'admin/shared/projects_head'
 %h3.page_title
   Projects
   = link_to 'New Project', new_admin_project_path, class: "btn small right"
+= render 'admin/shared/projects_head'
 %h3.page_title
   Project: #{@admin_project.name}
   = link_to edit_admin_project_path(@admin_project), class: "btn right" do
@@ -0,0 +1,5 @@
+%ul.nav.nav-tabs
+  = nav_link(controller: :projects) do
+    = link_to 'Projects', admin_projects_path, class: "tab"
+  = nav_link(controller: :groups) do
+    = link_to 'Groups', admin_groups_path, class: "tab"
@@ -3,11 +3,6 @@
     Projects
     %small
       (#{projects.count})
-    - if current_user.can_create_project?
-      %span.right
-        = link_to new_project_path, class: "btn very_small info" do
-          %i.icon-plus
-          New Project
   %ul.unstyled
     - projects.each do |project|
       %li.wll
@@ -8,7 +8,7 @@
       %ul.main_menu
         = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
           = link_to "Stats", admin_root_path
-        = nav_link(controller: :projects) do
+        = nav_link(controller: [:projects, :groups]) do
           = link_to "Projects", admin_projects_path
         = nav_link(controller: :users) do
           = link_to "Users", admin_users_path
@@ -46,6 +46,7 @@ Gitlab::Application.routes.draw do
     resources :groups, constraints: { id: /[^\/]+/ } do
       member do
         put :project_update
+        delete :remove_project
       end
     end
     resources :projects, constraints: { id: /[^\/]+/ } do
...	...	@@ -52,6 +52,14 @@ class Admin::GroupsController < AdminController
52	52	redirect_to :back, notice: 'Group was successfully updated.'
53	53	end
54	54
	55	+ def remove_project
	56	+ @project = Project.find(params[:project_id])
	57	+ @project.group_id = nil
	58	+ @project.save
	59	+
	60	+ redirect_to :back, notice: 'Group was successfully updated.'
	61	+ end
	62	+
55	63	def destroy
56	64	@group.destroy
57	65
...	...
...	...	@@ -16,4 +16,4 @@
16	16	= f.text_field :code, placeholder: "example"
17	17
18	18	.form-actions
19		- = f.submit 'Create group', class: "btn primary"
	19	+ = f.submit 'Save group', class: "btn save-btn"
...	...
...	...	@@ -0,0 +1,3 @@
	1	+%h3.page_title Edit Group
	2	+%br
	3	+= render 'form'
...	...
	1	+= render 'admin/shared/projects_head'
1	2	%h3.page_title
2	3	Groups
3	4	= link_to 'New Group', new_admin_group_path, class: "btn small right"
...	...
	1	+= render 'admin/shared/projects_head'
1	2	%h3.page_title
2	3	Group: #{@group.name}
3	4	= link_to edit_admin_group_path(@group), class: "btn right" do
...	...	@@ -38,6 +39,9 @@
38	39	%li.wll
39	40	%strong
40	41	= link_to project.name, [:admin, project]
	42	+ .right
	43	+ = link_to 'Remove from group', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Are you sure?', method: :delete, class: "btn danger small"
	44	+ .clearfix
41	45
42	46	%br
43	47	%h3 Add new project
...	...
	1	+= render 'admin/shared/projects_head'
1	2	%h3.page_title
2	3	Projects
3	4	= link_to 'New Project', new_admin_project_path, class: "btn small right"
...	...
	1	+= render 'admin/shared/projects_head'
1	2	%h3.page_title
2	3	Project: #{@admin_project.name}
3	4	= link_to edit_admin_project_path(@admin_project), class: "btn right" do
...	...
...	...	@@ -0,0 +1,5 @@
	1	+%ul.nav.nav-tabs
	2	+ = nav_link(controller: :projects) do
	3	+ = link_to 'Projects', admin_projects_path, class: "tab"
	4	+ = nav_link(controller: :groups) do
	5	+ = link_to 'Groups', admin_groups_path, class: "tab"
...	...
...	...	@@ -3,11 +3,6 @@
3	3	Projects
4	4	%small
5	5	(#{projects.count})
6		- - if current_user.can_create_project?
7		- %span.right
8		- = link_to new_project_path, class: "btn very_small info" do
9		- %i.icon-plus
10		- New Project
11	6	%ul.unstyled
12	7	- projects.each do \|project\|
13	8	%li.wll
...	...
...	...	@@ -8,7 +8,7 @@
8	8	%ul.main_menu
9	9	= nav_link(controller: :dashboard, html_options: {class: 'home'}) do
10	10	= link_to "Stats", admin_root_path
11		- = nav_link(controller: :projects) do
	11	+ = nav_link(controller: [:projects, :groups]) do
12	12	= link_to "Projects", admin_projects_path
13	13	= nav_link(controller: :users) do
14	14	= link_to "Users", admin_users_path
...	...