add ability to change namespace from project edit page

Dmitriy Zaporozhets
1 parent f9979476
Showing 9 changed files with 65 additions and 27 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/groups_controller.rb
app/controllers/projects_controller.rb
app/models/ability.rb
app/models/project.rb
app/views/groups/_projects.html.haml
app/views/projects/_form.html.haml
app/views/projects/_new_form.html.haml
app/views/projects/update.js.haml
@@ -64,9 +64,8 @@ class ApplicationController &lt; ActionController::Base
  
   def project
     id = params[:project_id] || params[:id]
-    id = id.split("/") if id.include?("/")
  
-    @project ||= current_user.projects.find_by_path(id)
+    @project ||= current_user.projects.find_with_namespace(id)
     @project || render_404
   end
  
@@ -4,6 +4,7 @@ class GroupsController &lt; ApplicationController
  
   before_filter :group
   before_filter :projects
+  before_filter :add_project_abilities
  
   def show
     @events = Event.in_projects(project_ids).limit(20).offset(params[:offset] || 0)
@@ -34,8 +34,16 @@ class ProjectsController &lt; ProjectResourceController
   end
  
   def update
+    namespace_id = params[:project].delete(:namespace_id)
+
+    if namespace_id
+      namespace = Namespace.find(namespace_id)
+      project.transfer(namespace)
+    end
+
     respond_to do |format|
       if project.update_attributes(params[:project])
+        flash[:notice] = 'Project was successfully updated.'
         format.html { redirect_to edit_project_path(project), notice: 'Project was successfully updated.' }
         format.js
       else
@@ -7,6 +7,7 @@ class Ability
       when "Note" then note_abilities(object, subject)
       when "Snippet" then snippet_abilities(object, subject)
       when "MergeRequest" then merge_request_abilities(object, subject)
+      when "Group" then group_abilities(object, subject)
       else []
       end
     end
@@ -61,6 +62,16 @@ class Ability
       rules.flatten
     end
  
+    def group_abilities user, group
+      rules = []
+
+      rules << [
+        :manage_group
+      ] if group.owner == user
+
+      rules.flatten
+    end
+
     [:issue, :note, :snippet, :merge_request].each do |name|
       define_method "#{name}_abilities" do |user, subject|
         if subject.author == user
@@ -84,6 +84,16 @@ class Project &lt; ActiveRecord::Base
       where("projects.name LIKE :query OR projects.path LIKE :query", query: "%#{query}%")
     end
  
+    def find_with_namespace(id)
+      if id.include?("/")
+        id = id.split("/")
+        namespace_id = Namespace.find_by_path(id.first).id
+        where(namespace_id: namespace_id).find_by_path(id.last)
+      else
+        find_by_path(id)
+      end
+    end
+
     def create_by_user(params, user)
       namespace_id = params.delete(:namespace_id)
       namespace_id ||= user.namespace.try(:id)
@@ -3,6 +3,11 @@
     Projects
     %small
       (#{projects.count})
+    - if can? current_user, :manage_group, @group
+      %span.right
+        = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do
+          %i.icon-plus
+          New Project
   %ul.unstyled
     - projects.each do |project|
       %li.wll
@@ -9,41 +9,45 @@
       Project name is
     .input
       = f.text_field :name, placeholder: "Example Project", class: "xxlarge"
-
   %fieldset
     %legend  Advanced settings:
-    .clearfix
+    .control-group
       = f.label :path do
         Path
-      .input
-        .input-prepend
-          %strong
-            = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
-
-    - unless @project.new_record? || @project.heads.empty?
+      .controls
+        = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
+
+    .control-group
+      = f.label :namespace_id do
+        %span Namespace
+      .controls
+        = f.select :namespace_id, namespaces_options(@project.namespace_id), {}, {class: 'chosen'}
+        &nbsp;
+        %span.cred Be careful. Changing project namespace can have unintended side effects
+
+    - unless @project.heads.empty?
       .clearfix
         = f.label :default_branch, "Default Branch"
         .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;")
  
-  - unless @project.new_record?
-    %fieldset
-      %legend Features:
+  %fieldset
+    %legend Features:
  
-      .clearfix
-        = f.label :issues_enabled, "Issues"
-        .input= f.check_box :issues_enabled
+    .clearfix
+      = f.label :issues_enabled, "Issues"
+      .input= f.check_box :issues_enabled
  
-      .clearfix
-        = f.label :merge_requests_enabled, "Merge Requests"
-        .input= f.check_box :merge_requests_enabled
+    .clearfix
+      = f.label :merge_requests_enabled, "Merge Requests"
+      .input= f.check_box :merge_requests_enabled
  
-      .clearfix
-        = f.label :wall_enabled, "Wall"
-        .input= f.check_box :wall_enabled
+    .clearfix
+      = f.label :wall_enabled, "Wall"
+      .input= f.check_box :wall_enabled
  
-      .clearfix
-        = f.label :wiki_enabled, "Wiki"
-        .input= f.check_box :wiki_enabled
+    .clearfix
+      = f.label :wiki_enabled, "Wiki"
+      .input= f.check_box :wiki_enabled
  
   %br
  
@@ -14,7 +14,7 @@
       = f.label :namespace_id do
         %span.cgray Namespace
       .input
-        = f.select :namespace_id, namespaces_options, {}, {class: 'chosen'}
+        = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen'}
   %hr
   %p.padded
     All created project are private. You choose who can see project and commit to repository.
 - if @project.valid?
   :plain
-    location.href = "#{edit_project_path(@project, notice: 'Project was successfully updated.')}";
+    location.href = "#{edit_project_path(@project)}";
 - else
   :plain
     $('.project_edit_holder').show();
...	...	@@ -64,9 +64,8 @@ class ApplicationController < ActionController::Base
64	64
65	65	def project
66	66	id = params[:project_id] \|\| params[:id]
67		- id = id.split("/") if id.include?("/")
68	67
69		- @project \|\|= current_user.projects.find_by_path(id)
	68	+ @project \|\|= current_user.projects.find_with_namespace(id)
70	69	@project \|\| render_404
71	70	end
72	71
...	...
...	...	@@ -4,6 +4,7 @@ class GroupsController < ApplicationController
4	4
5	5	before_filter :group
6	6	before_filter :projects
	7	+ before_filter :add_project_abilities
7	8
8	9	def show
9	10	@events = Event.in_projects(project_ids).limit(20).offset(params[:offset] \|\| 0)
...	...
...	...	@@ -34,8 +34,16 @@ class ProjectsController < ProjectResourceController
34	34	end
35	35
36	36	def update
	37	+ namespace_id = params[:project].delete(:namespace_id)
	38	+
	39	+ if namespace_id
	40	+ namespace = Namespace.find(namespace_id)
	41	+ project.transfer(namespace)
	42	+ end
	43	+
37	44	respond_to do \|format\|
38	45	if project.update_attributes(params[:project])
	46	+ flash[:notice] = 'Project was successfully updated.'
39	47	format.html { redirect_to edit_project_path(project), notice: 'Project was successfully updated.' }
40	48	format.js
41	49	else
...	...
...	...	@@ -7,6 +7,7 @@ class Ability
7	7	when "Note" then note_abilities(object, subject)
8	8	when "Snippet" then snippet_abilities(object, subject)
9	9	when "MergeRequest" then merge_request_abilities(object, subject)
	10	+ when "Group" then group_abilities(object, subject)
10	11	else []
11	12	end
12	13	end
...	...	@@ -61,6 +62,16 @@ class Ability
61	62	rules.flatten
62	63	end
63	64
	65	+ def group_abilities user, group
	66	+ rules = []
	67	+
	68	+ rules << [
	69	+ :manage_group
	70	+ ] if group.owner == user
	71	+
	72	+ rules.flatten
	73	+ end
	74	+
64	75	[:issue, :note, :snippet, :merge_request].each do \|name\|
65	76	define_method "#{name}_abilities" do \|user, subject\|
66	77	if subject.author == user
...	...
...	...	@@ -84,6 +84,16 @@ class Project < ActiveRecord::Base
84	84	where("projects.name LIKE :query OR projects.path LIKE :query", query: "%#{query}%")
85	85	end
86	86
	87	+ def find_with_namespace(id)
	88	+ if id.include?("/")
	89	+ id = id.split("/")
	90	+ namespace_id = Namespace.find_by_path(id.first).id
	91	+ where(namespace_id: namespace_id).find_by_path(id.last)
	92	+ else
	93	+ find_by_path(id)
	94	+ end
	95	+ end
	96	+
87	97	def create_by_user(params, user)
88	98	namespace_id = params.delete(:namespace_id)
89	99	namespace_id \|\|= user.namespace.try(:id)
...	...
...	...	@@ -3,6 +3,11 @@
3	3	Projects
4	4	%small
5	5	(#{projects.count})
	6	+ - if can? current_user, :manage_group, @group
	7	+ %span.right
	8	+ = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do
	9	+ %i.icon-plus
	10	+ New Project
6	11	%ul.unstyled
7	12	- projects.each do \|project\|
8	13	%li.wll
...	...
...	...	@@ -9,41 +9,45 @@
9	9	Project name is
10	10	.input
11	11	= f.text_field :name, placeholder: "Example Project", class: "xxlarge"
12		-
13	12	%fieldset
14	13	%legend Advanced settings:
15		- .clearfix
	14	+ .control-group
16	15	= f.label :path do
17	16	Path
18		- .input
19		- .input-prepend
20		- %strong
21		- = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
22		-
23		- - unless @project.new_record? \|\| @project.heads.empty?
	17	+ .controls
	18	+ = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
	19	+
	20	+ .control-group
	21	+ = f.label :namespace_id do
	22	+ %span Namespace
	23	+ .controls
	24	+ = f.select :namespace_id, namespaces_options(@project.namespace_id), {}, {class: 'chosen'}
	25	+
	26	+ %span.cred Be careful. Changing project namespace can have unintended side effects
	27	+
	28	+ - unless @project.heads.empty?
24	29	.clearfix
25	30	= f.label :default_branch, "Default Branch"
26	31	.input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;")
27	32
28		- - unless @project.new_record?
29		- %fieldset
30		- %legend Features:
	33	+ %fieldset
	34	+ %legend Features:
31	35
32		- .clearfix
33		- = f.label :issues_enabled, "Issues"
34		- .input= f.check_box :issues_enabled
	36	+ .clearfix
	37	+ = f.label :issues_enabled, "Issues"
	38	+ .input= f.check_box :issues_enabled
35	39
36		- .clearfix
37		- = f.label :merge_requests_enabled, "Merge Requests"
38		- .input= f.check_box :merge_requests_enabled
	40	+ .clearfix
	41	+ = f.label :merge_requests_enabled, "Merge Requests"
	42	+ .input= f.check_box :merge_requests_enabled
39	43
40		- .clearfix
41		- = f.label :wall_enabled, "Wall"
42		- .input= f.check_box :wall_enabled
	44	+ .clearfix
	45	+ = f.label :wall_enabled, "Wall"
	46	+ .input= f.check_box :wall_enabled
43	47
44		- .clearfix
45		- = f.label :wiki_enabled, "Wiki"
46		- .input= f.check_box :wiki_enabled
	48	+ .clearfix
	49	+ = f.label :wiki_enabled, "Wiki"
	50	+ .input= f.check_box :wiki_enabled
47	51
48	52	%br
49	53
...	...
...	...	@@ -14,7 +14,7 @@
14	14	= f.label :namespace_id do
15	15	%span.cgray Namespace
16	16	.input
17		- = f.select :namespace_id, namespaces_options, {}, {class: 'chosen'}
	17	+ = f.select :namespace_id, namespaces_options(params[:namespace_id] \|\| :current_user), {}, {class: 'chosen'}
18	18	%hr
19	19	%p.padded
20	20	All created project are private. You choose who can see project and commit to repository.
...	...
1	1	- if @project.valid?
2	2	:plain
3		- location.href = "#{edit_project_path(@project, notice: 'Project was successfully updated.')}";
	3	+ location.href = "#{edit_project_path(@project)}";
4	4	- else
5	5	:plain
6	6	$('.project_edit_holder').show();
...	...