Download as
Browse Code »

Commit e292d7c17b48182f7f8df20d93b92e8ba9e98ce6

Authored by Dmitriy Zaporozhets
1 parent ff35b37f
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Make transfer action in project controller

Showing 6 changed files with 11 additions and 26 deletions   Show diff stats
app/contexts/projects/update_context.rb
  Diff comments   View file @e292d7c
1 1 module Projects
2 2 class UpdateContext < BaseContext
3 3 def execute(role = :default)
4   - namespace_id = params[:project].delete(:namespace_id)
  4 + params[:project].delete(:namespace_id)
5 5 params[:project].delete(:public) unless can?(current_user, :change_public_mode, project)
6   -
7   - allowed_transfer = can?(current_user, :change_namespace, project) || role == :admin
8   -
9   - if allowed_transfer && namespace_id.present?
10   - if namespace_id == Namespace.global_id
11   - if project.namespace.present?
12   - # Transfer to global namespace from anyone
13   - project.transfer(nil)
14   - end
15   - elsif namespace_id.to_i != project.namespace_id
16   - # Transfer to someone namespace
17   - namespace = Namespace.find(namespace_id)
18   - project.transfer(namespace)
19   - end
20   - end
21   -
22 6 project.update_attributes(params[:project], as: role)
23 7 end
24 8 end
... ...
app/controllers/projects_controller.rb
  Diff comments   View file @e292d7c
... ... @@ -4,7 +4,7 @@ class ProjectsController &lt; ProjectResourceController
4 4  
5 5 # Authorize
6 6 before_filter :authorize_read_project!, except: [:index, :new, :create]
7   - before_filter :authorize_admin_project!, only: [:edit, :update, :destroy]
  7 + before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer]
8 8 before_filter :require_non_empty_project, only: [:blob, :tree, :graph]
9 9  
10 10 layout 'application', only: [:new, :create]
... ... @@ -45,10 +45,10 @@ class ProjectsController &lt; ProjectResourceController
45 45 format.js
46 46 end
47 47 end
  48 + end
48 49  
49   - rescue Project::TransferError => ex
50   - @error = ex
51   - render :update_failed
  50 + def transfer
  51 + ::Projects::TransferContext.new(project, current_user, params).execute
52 52 end
53 53  
54 54 def show
... ...
app/models/project.rb
  Diff comments   View file @e292d7c
... ... @@ -26,8 +26,6 @@ class Project &lt; ActiveRecord::Base
26 26 include Gitlab::ShellAdapter
27 27 extend Enumerize
28 28  
29   - class TransferError < StandardError; end
30   -
31 29 attr_accessible :name, :path, :description, :default_branch, :issues_tracker,
32 30 :issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
33 31 :wiki_enabled, :public, :import_url, as: [:default, :admin]
... ...
app/views/projects/_form.html.haml
  Diff comments   View file @e292d7c
... ... @@ -107,8 +107,9 @@
107 107 - if can?(current_user, :change_namespace, @project)
108 108 .ui-box.ui-box-danger
109 109 %h5.title Transfer project
  110 + .errors-holder
110 111 .form-holder
111   - = form_for(@project, remote: true, html: { class: 'transfer-project' }) do |f|
  112 + = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
112 113 .control-group
113 114 = f.label :namespace_id do
114 115 %span Namespace
... ...
app/views/projects/update_failed.js.haml
View file @ff35b37
... ... @@ -1,2 +0,0 @@
1   -:plain
2   - $(".save-project-loader").replaceWith(errorMessage('#{escape_javascript(@error.message)}'));
config/routes.rb
  Diff comments   View file @e292d7c
... ... @@ -167,6 +167,10 @@ Gitlab::Application.routes.draw do
167 167 # Project Area
168 168 #
169 169 resources :projects, constraints: { id: /(?:[a-zA-Z.0-9_\-]+\/)?[a-zA-Z.0-9_\-]+/ }, except: [:new, :create, :index], path: "/" do
  170 + member do
  171 + put :transfer
  172 + end
  173 +
170 174 resources :blob, only: [:show], constraints: {id: /.+/}
171 175 resources :tree, only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
172 176 resources :edit_tree, only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
... ...