Merge branch 'feature/admin_project_transfer' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 77e3fab8 27ad8826
Showing 14 changed files with 187 additions and 23 deletions Show diff stats
CHANGELOG
app/assets/javascripts/api.js.coffee
app/assets/javascripts/namespace_select.js.coffee
app/assets/stylesheets/common.scss
app/assets/stylesheets/selects.scss
app/controllers/admin/projects_controller.rb
app/helpers/namespaces_helper.rb
app/models/namespace.rb
app/views/admin/projects/show.html.haml
config/routes.rb
lib/api/api.rb
lib/api/entities.rb
lib/api/namespaces.rb
spec/requests/api/namespaces_spec.rb
@@ -17,6 +17,7 @@ v 6.3.0
   - Fix 500 error for repos with newline in file name
   - Extended html titles
   - API: create/update repo files
+  - Admin can transfer project to any namespace
 v 6.2.0
   - Public project pages are now visible to everyone (files, issues, wik, etc.)
@@ -2,6 +2,7 @@
   users_path: "/api/:version/users.json"
   user_path: "/api/:version/users/:id.json"
   notes_path: "/api/:version/projects/:id/notes.json"
+  namespaces_path: "/api/:version/namespaces.json"
   # Get 20 (depends on api) recent notes
   # and sort the ascending from oldest to newest
@@ -49,6 +50,20 @@
     ).done (users) ->
       callback(users)
+  # Return namespaces list. Filtered by query
+  namespaces: (query, callback) ->
+    url = Api.buildUrl(Api.namespaces_path)
+
+    $.ajax(
+      url: url
+      data:
+        private_token: gon.api_token
+        search: query
+        per_page: 20
+      dataType: "json"
+    ).done (namespaces) ->
+      callback(namespaces)
+
   buildUrl: (url) ->
     url = gon.relative_url_root + url if gon.relative_url_root?
     return url.replace(':version', gon.api_version)
@@ -0,0 +1,24 @@
+$ ->
+  namespaceFormatResult = (namespace) ->
+    markup = "<div class='namespace-result'>"
+    markup += "<span class='namespace-kind'>" + namespace.kind + "</span>"
+    markup += "<span class='namespace-path'>" + namespace.path + "</span>"
+    markup += "</div>"
+    markup
+
+  formatSelection = (namespace) ->
+    namespace.kind + ": " + namespace.path
+
+  $('.ajax-namespace-select').each (i, select) ->
+    $(select).select2
+      placeholder: "Search for namespace"
+      multiple: $(select).hasClass('multiselect')
+      minimumInputLength: 0
+      query: (query) ->
+        Api.namespaces query.term, (namespaces) ->
+          data = { results: namespaces }
+          query.callback(data)
+
+      dropdownCssClass: "ajax-namespace-dropdown"
+      formatResult: namespaceFormatResult
+      formatSelection: formatSelection
@@ -358,3 +358,33 @@ table {
   background: #555;
   color: #BBB;
 }
+
+.ajax-users-select {
+  width: 400px;
+
+  &.input-large {
+    width: 210px;
+  }
+}
+
+.user-result {
+  .user-image {
+    float: left;
+  }
+  .user-name {
+  }
+  .user-username {
+    color: #999;
+  }
+}
+
+.namespace-result {
+  .namespace-kind {
+    color: #AAA;
+    font-weight: normal;
+  }
+  .namespace-path {
+    margin-left: 10px;
+    font-weight: bolder;
+  }
+}
-.ajax-users-select {
-  width: 400px;
-
-  &.input-large {
-    width: 210px;
-  }
-}
-
-.user-result {
-  .user-image {
-    float: left;
-  }
-  .user-name {
-  }
-  .user-username {
-    color: #999;
-  }
-}
-
 /** Chosen.js selectbox style override **/
 .chosen-container {
   min-width: 100px;
 class Admin::ProjectsController < Admin::ApplicationController
-  before_filter :project, only: [:edit, :show, :update, :destroy, :team_update]
+  before_filter :project, only: [:show, :transfer]
+  before_filter :group, only: [:show, :transfer]
+  before_filter :repository, only: [:show, :transfer]
   def index
     owner_id = params[:owner_id]
@@ -14,8 +16,16 @@ class Admin::ProjectsController &lt; Admin::ApplicationController
   end
   def show
-    @repository = @project.repository
-    @group = @project.group
+  end
+
+  def transfer
+    result = ::Projects::TransferContext.new(@project, current_user, project: params).execute(:admin)
+
+    if result
+      redirect_to [:admin, @project]
+    else
+      render :show
+    end
   end
   protected
@@ -26,4 +36,12 @@ class Admin::ProjectsController &lt; Admin::ApplicationController
     @project = Project.find_with_namespace(id)
     @project || render_404
   end
+
+  def group
+    @group ||= project.group
+  end
+
+  def repository
+    @repository ||= project.repository
+  end
 end
@@ -16,4 +16,13 @@ module NamespacesHelper
     grouped_options_for_select(options, selected)
   end
+
+  def namespace_select_tag(id, opts = {})
+    css_class = "ajax-namespace-select "
+    css_class << "multiselect " if opts[:multiple]
+    css_class << (opts[:class] || '')
+    value = opts[:selected] || ''
+
+    hidden_field_tag(id, value, class: css_class)
+  end
 end
@@ -87,4 +87,8 @@ class Namespace &lt; ActiveRecord::Base
   def send_update_instructions
     projects.each(&:send_move_instructions)
   end
+
+  def kind
+    type == 'Group' ? 'group' : 'user'
+  end
 end
@@ -74,6 +74,23 @@
               %span.cgreen
                 %i.icon-lock
                 Private
+    .ui-box
+      .title
+        Transfer project
+      .ui-box-body
+        = form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
+          .control-group
+            = f.label :namespace_id, "Namespace"
+            .controls
+              = namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
+
+          .control-group
+            .controls
+              = f.submit 'Transfer', class: 'btn btn-primary'
+
+
+
+
   .span6
     - if @group
       .ui-box
@@ -89,7 +89,13 @@ Gitlab::Application.routes.draw do
     resources :broadcast_messages, only: [:index, :create, :destroy]
     resource :logs, only: [:show]
     resource :background_jobs, controller: 'background_jobs', only: [:show]
-    resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show]
+
+    resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do
+      member do
+        put :transfer
+      end
+    end
+
     root to: "dashboard#index"
   end
@@ -40,5 +40,6 @@ module API
     mount ProjectHooks
     mount Services
     mount Files
+    mount Namespaces
   end
 end
@@ -136,5 +136,9 @@ module API
       expose :target_id, :target_type, :author_id
       expose :data, :target_title
     end
+
+    class Namespace < Grape::Entity
+      expose :id, :path, :kind
+    end
   end
 end
@@ -0,0 +1,23 @@
+module API
+  # namespaces API
+  class Namespaces < Grape::API
+    before {
+      authenticate!
+      authenticated_as_admin!
+    }
+
+    resource :namespaces do
+      # Get a namespaces list
+      #
+      # Example Request:
+      #  GET /namespaces
+      get do
+        @namespaces = Namespace.scoped
+        @namespaces = @namespaces.search(params[:search]) if params[:search].present?
+        @namespaces = paginate @namespaces
+
+        present @namespaces, with: Entities::Namespace
+      end
+    end
+  end
+end
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe API::API do
+  include ApiHelpers
+  before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
+  after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
+
+  let(:admin) { create(:admin) }
+  let!(:group1) { create(:group) }
+  let!(:group2) { create(:group) }
+
+  describe "GET /namespaces" do
+    context "when unauthenticated" do
+      it "should return authentication error" do
+        get api("/namespaces")
+        response.status.should == 401
+      end
+    end
+
+    context "when authenticated as  admin" do
+      it "admin: should return an array of all namespaces" do
+        get api("/namespaces", admin)
+        response.status.should == 200
+        json_response.should be_an Array
+
+        # Admin namespace + 2 group namespaces
+        json_response.length.should == 3
+      end
+    end
+  end
+end
	@@ -17,6 +17,7 @@ v 6.3.0		@@ -17,6 +17,7 @@ v 6.3.0
17	- Fix 500 error for repos with newline in file name	17	- Fix 500 error for repos with newline in file name
18	- Extended html titles	18	- Extended html titles
19	- API: create/update repo files	19	- API: create/update repo files
		20	+ - Admin can transfer project to any namespace
20		21
21	v 6.2.0	22	v 6.2.0
22	- Public project pages are now visible to everyone (files, issues, wik, etc.)	23	- Public project pages are now visible to everyone (files, issues, wik, etc.)
	@@ -2,6 +2,7 @@		@@ -2,6 +2,7 @@
2	users_path: "/api/:version/users.json"	2	users_path: "/api/:version/users.json"
3	user_path: "/api/:version/users/:id.json"	3	user_path: "/api/:version/users/:id.json"
4	notes_path: "/api/:version/projects/:id/notes.json"	4	notes_path: "/api/:version/projects/:id/notes.json"
		5	+ namespaces_path: "/api/:version/namespaces.json"
5		6
6	# Get 20 (depends on api) recent notes	7	# Get 20 (depends on api) recent notes
7	# and sort the ascending from oldest to newest	8	# and sort the ascending from oldest to newest
	@@ -49,6 +50,20 @@		@@ -49,6 +50,20 @@
49	).done (users) ->	50	).done (users) ->
50	callback(users)	51	callback(users)
51		52
		53	+ # Return namespaces list. Filtered by query
		54	+ namespaces: (query, callback) ->
		55	+ url = Api.buildUrl(Api.namespaces_path)
		56	+
		57	+ $.ajax(
		58	+ url: url
		59	+ data:
		60	+ private_token: gon.api_token
		61	+ search: query
		62	+ per_page: 20
		63	+ dataType: "json"
		64	+ ).done (namespaces) ->
		65	+ callback(namespaces)
		66	+
52	buildUrl: (url) ->	67	buildUrl: (url) ->
53	url = gon.relative_url_root + url if gon.relative_url_root?	68	url = gon.relative_url_root + url if gon.relative_url_root?
54	return url.replace(':version', gon.api_version)	69	return url.replace(':version', gon.api_version)
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+$ ->
	2	+ namespaceFormatResult = (namespace) ->
	3	+ markup = "<div class='namespace-result'>"
	4	+ markup += "<span class='namespace-kind'>" + namespace.kind + "</span>"
	5	+ markup += "<span class='namespace-path'>" + namespace.path + "</span>"
	6	+ markup += "</div>"
	7	+ markup
	8	+
	9	+ formatSelection = (namespace) ->
	10	+ namespace.kind + ": " + namespace.path
	11	+
	12	+ $('.ajax-namespace-select').each (i, select) ->
	13	+ $(select).select2
	14	+ placeholder: "Search for namespace"
	15	+ multiple: $(select).hasClass('multiselect')
	16	+ minimumInputLength: 0
	17	+ query: (query) ->
	18	+ Api.namespaces query.term, (namespaces) ->
	19	+ data = { results: namespaces }
	20	+ query.callback(data)
	21	+
	22	+ dropdownCssClass: "ajax-namespace-dropdown"
	23	+ formatResult: namespaceFormatResult
	24	+ formatSelection: formatSelection
	@@ -358,3 +358,33 @@ table {		@@ -358,3 +358,33 @@ table {
358	background: #555;	358	background: #555;
359	color: #BBB;	359	color: #BBB;
360	}	360	}
		361	+
		362	+.ajax-users-select {
		363	+ width: 400px;
		364	+
		365	+ &.input-large {
		366	+ width: 210px;
		367	+ }
		368	+}
		369	+
		370	+.user-result {
		371	+ .user-image {
		372	+ float: left;
		373	+ }
		374	+ .user-name {
		375	+ }
		376	+ .user-username {
		377	+ color: #999;
		378	+ }
		379	+}
		380	+
		381	+.namespace-result {
		382	+ .namespace-kind {
		383	+ color: #AAA;
		384	+ font-weight: normal;
		385	+ }
		386	+ .namespace-path {
		387	+ margin-left: 10px;
		388	+ font-weight: bolder;
		389	+ }
		390	+}
1	-.ajax-users-select {
2	- width: 400px;
3	-
4	- &.input-large {
5	- width: 210px;
6	- }
7	-}
8	-
9	-.user-result {
10	- .user-image {
11	- float: left;
12	- }
13	- .user-name {
14	- }
15	- .user-username {
16	- color: #999;
17	- }
18	-}
19	-
20	/ Chosen.js selectbox style override /	1	/ Chosen.js selectbox style override /
21	.chosen-container {	2	.chosen-container {
22	min-width: 100px;	3	min-width: 100px;
1	class Admin::ProjectsController < Admin::ApplicationController	1	class Admin::ProjectsController < Admin::ApplicationController
2	- before_filter :project, only: [:edit, :show, :update, :destroy, :team_update]	2	+ before_filter :project, only: [:show, :transfer]
		3	+ before_filter :group, only: [:show, :transfer]
		4	+ before_filter :repository, only: [:show, :transfer]
3		5
4	def index	6	def index
5	owner_id = params[:owner_id]	7	owner_id = params[:owner_id]
	@@ -14,8 +16,16 @@ class Admin::ProjectsController < Admin::ApplicationController		@@ -14,8 +16,16 @@ class Admin::ProjectsController < Admin::ApplicationController
14	end	16	end
15		17
16	def show	18	def show
17	- @repository = @project.repository
18	- @group = @project.group	19	+ end
		20	+
		21	+ def transfer
		22	+ result = ::Projects::TransferContext.new(@project, current_user, project: params).execute(:admin)
		23	+
		24	+ if result
		25	+ redirect_to [:admin, @project]
		26	+ else
		27	+ render :show
		28	+ end
19	end	29	end
20		30
21	protected	31	protected
	@@ -26,4 +36,12 @@ class Admin::ProjectsController < Admin::ApplicationController		@@ -26,4 +36,12 @@ class Admin::ProjectsController < Admin::ApplicationController
26	@project = Project.find_with_namespace(id)	36	@project = Project.find_with_namespace(id)
27	@project \|\| render_404	37	@project \|\| render_404
28	end	38	end
		39	+
		40	+ def group
		41	+ @group \|\|= project.group
		42	+ end
		43	+
		44	+ def repository
		45	+ @repository \|\|= project.repository
		46	+ end
29	end	47	end
	@@ -16,4 +16,13 @@ module NamespacesHelper		@@ -16,4 +16,13 @@ module NamespacesHelper
16		16
17	grouped_options_for_select(options, selected)	17	grouped_options_for_select(options, selected)
18	end	18	end
		19	+
		20	+ def namespace_select_tag(id, opts = {})
		21	+ css_class = "ajax-namespace-select "
		22	+ css_class << "multiselect " if opts[:multiple]
		23	+ css_class << (opts[:class] \|\| '')
		24	+ value = opts[:selected] \|\| ''
		25	+
		26	+ hidden_field_tag(id, value, class: css_class)
		27	+ end
19	end	28	end
	@@ -87,4 +87,8 @@ class Namespace < ActiveRecord::Base		@@ -87,4 +87,8 @@ class Namespace < ActiveRecord::Base
87	def send_update_instructions	87	def send_update_instructions
88	projects.each(&:send_move_instructions)	88	projects.each(&:send_move_instructions)
89	end	89	end
		90	+
		91	+ def kind
		92	+ type == 'Group' ? 'group' : 'user'
		93	+ end
90	end	94	end
	@@ -74,6 +74,23 @@		@@ -74,6 +74,23 @@
74	%span.cgreen	74	%span.cgreen
75	%i.icon-lock	75	%i.icon-lock
76	Private	76	Private
		77	+ .ui-box
		78	+ .title
		79	+ Transfer project
		80	+ .ui-box-body
		81	+ = form_for @project, url: transfer_admin_project_path(@project), method: :put do \|f\|
		82	+ .control-group
		83	+ = f.label :namespace_id, "Namespace"
		84	+ .controls
		85	+ = namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
		86	+
		87	+ .control-group
		88	+ .controls
		89	+ = f.submit 'Transfer', class: 'btn btn-primary'
		90	+
		91	+
		92	+
		93	+
77	.span6	94	.span6
78	- if @group	95	- if @group
79	.ui-box	96	.ui-box
	@@ -40,5 +40,6 @@ module API		@@ -40,5 +40,6 @@ module API
40	mount ProjectHooks	40	mount ProjectHooks
41	mount Services	41	mount Services
42	mount Files	42	mount Files
		43	+ mount Namespaces
43	end	44	end
44	end	45	end