User can create group

Dmitriy Zaporozhets
1 parent d9027df5
Showing 12 changed files with 117 additions and 31 deletions Show diff stats
app/controllers/groups_controller.rb
app/helpers/tab_helper.rb
app/models/user.rb
app/views/dashboard/_groups.html.haml
app/views/groups/new.html.haml
app/views/layouts/_head_panel.html.haml
app/views/projects/_new_form.html.haml
app/views/users/_profile.html.haml
app/views/users/show.html.haml
config/routes.rb
features/group/create_group.feature
features/steps/group/group.rb
 class GroupsController < ApplicationController
   respond_to :html
-  layout 'group'
+  layout 'group', except: [:new, :create]
  
-  before_filter :group
-  before_filter :projects
+  before_filter :group, except: [:new, :create]
  
   # Authorize
-  before_filter :authorize_read_group!
+  before_filter :authorize_read_group!, except: [:new, :create]
+
+  # Load group projects
+  before_filter :projects, except: [:new, :create]
+
+  def new
+    @group = Group.new
+  end
+
+  def create
+    @group = Group.new(params[:group])
+    @group.path = @group.name.dup.parameterize if @group.name
+    @group.owner = current_user
+
+    if @group.save
+      redirect_to @group, notice: 'Group was successfully created.'
+    else
+      render action: "new"
+    end
+  end
  
   def show
     @events = Event.in_projects(project_ids).limit(20).offset(params[:offset] || 0)
@@ -39,7 +39,12 @@ module TabHelper
   # Returns a list item element String
   def nav_link(options = {}, &block)
     if path = options.delete(:path)
-      c, a, _ = path.split('#')
+      if path.respond_to?(:each)
+        c = path.map { |p| p.split('#').first }
+        a = path.map { |p| p.split('#').last }
+      else
+        c, a, _ = path.split('#')
+      end
     else
       c = options.delete(:controller)
       a = options.delete(:action)
@@ -220,7 +220,7 @@ class User &lt; ActiveRecord::Base
   end
  
   def can_create_group?
-    is_admin?
+    can_create_project?
   end
  
   def abilities
@@ -5,7 +5,7 @@
       (#{groups.count})
     - if current_user.can_create_group?
       %span.right
-        = link_to new_admin_group_path, class: "btn very_small info" do
+        = link_to new_group_path, class: "btn very_small info" do
           %i.icon-plus
           New Group
   %ul.well-list
@@ -0,0 +1,21 @@
+%h3.page_title New Group
+%hr
+= form_for @group do |f|
+  - if @group.errors.any?
+    .alert-message.block-message.error
+      %span= @group.errors.full_messages.first
+  .clearfix
+    = f.label :name do
+      Group name is
+    .input
+      = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
+      &nbsp;
+      = f.submit 'Create group', class: "btn primary"
+  %hr
+  .padded
+    %ul
+      %li Group is kind of directory for several projects
+      %li All created groups are private
+      %li People within a group see only projects they have access to
+      %li All projects of group will be stored in group directory
+      %li You will be able to move existing projects into group
@@ -17,7 +17,7 @@
             = link_to new_project_path, title: "Create New Project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project'  do
               %i.icon-plus
         %li
-          = link_to profile_path, title: "Your Profile", class: 'has_bottom_tooltip', 'data-original-title' => 'Your profile'  do
+          = link_to profile_path, title: "My Profile", class: 'has_bottom_tooltip', 'data-original-title' => 'Your profile'  do
             %i.icon-user
         %li.separator
         %li
@@ -15,6 +15,12 @@
         %span Namespace
       .input
         = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen'}
+  - elsif current_user.can_create_group?
+    .clearfix
+      .input.light
+        Need a group for several projects?
+        = link_to new_group_path, class: "btn very_small" do
+          Create a group
   %hr
   %p.padded
     New projects are private by default. You choose who can see the project and commit to repository.
@@ -0,0 +1,23 @@
+.ui-box
+  %h5.title
+    Profile
+  %ul.well-list
+    %li
+      %strong Email
+      %span.right= mail_to @user.email
+    - unless @user.skype.blank?
+      %li
+        %strong Skype
+        %span.right= @user.skype
+    - unless @user.linkedin.blank?
+      %li
+        %strong LinkedIn
+        %span.right= @user.linkedin
+    - unless @user.twitter.blank?
+      %li
+        %strong Twitter
+        %span.right= @user.twitter
+    - unless @user.bio.blank?
+      %li
+        %strong Bio
+        %span.right= @user.bio
@@ -3,6 +3,11 @@
     %h3.page_title
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
       = @user.name
+      - if @user == current_user
+        .right
+          = link_to profile_path, class: 'btn small' do
+            %i.icon-edit
+            Edit Profile
       %br
       %small @#{@user.username}
       %br
@@ -12,26 +17,5 @@
     %h5 Recent events
     = render @events
   .span4
-    .ui-box
-      %h5.title Profile
-      %ul.well-list
-        %li
-          %strong Email
-          %span.right= mail_to @user.email
-        - unless @user.skype.blank?
-          %li
-            %strong Skype
-            %span.right= @user.skype
-        - unless @user.linkedin.blank?
-          %li
-            %strong LinkedIn
-            %span.right= @user.linkedin
-        - unless @user.twitter.blank?
-          %li
-            %strong Twitter
-            %span.right= @user.twitter
-        - unless @user.bio.blank?
-          %li
-            %strong Bio
-            %span.right= @user.bio
+    = render 'profile'
     = render 'projects'
@@ -112,7 +112,7 @@ Gitlab::Application.routes.draw do
   #
   # Groups Area
   #
-  resources :groups, constraints: { id: /[^\/]+/ }, only: [:show] do
+  resources :groups, constraints: { id: /[^\/]+/ }, only: [:show, :new, :create] do
     member do
       get :issues
       get :merge_requests
@@ -0,0 +1,11 @@
+Feature: Groups
+  Background:
+    Given I sign in as a user
+
+  Scenario: Create a group from dasboard
+    Given I have group with projects
+    And I visit dashboard page
+    When I click new group link
+    And submit form with new group info
+    Then I should be redirected to group page
+    And I should see newly created group
@@ -64,6 +64,24 @@ class Groups &lt; Spinach::FeatureSteps
       author: current_user
   end
  
+  When 'I click new group link' do
+    click_link "New Group"
+  end
+
+  And 'submit form with new group info' do
+    fill_in 'group_name', :with => 'Samurai'
+    click_button "Create group"
+  end
+
+  Then 'I should see newly created group' do
+    page.should have_content "Samurai"
+    page.should have_content "You will only see events from projects in this group"
+  end
+
+  Then 'I should be redirected to group page' do
+    current_path.should == group_path(Group.last)
+  end
+
   protected
  
   def current_group
1	1	class GroupsController < ApplicationController
2	2	respond_to :html
3		- layout 'group'
	3	+ layout 'group', except: [:new, :create]
4	4
5		- before_filter :group
6		- before_filter :projects
	5	+ before_filter :group, except: [:new, :create]
7	6
8	7	# Authorize
9		- before_filter :authorize_read_group!
	8	+ before_filter :authorize_read_group!, except: [:new, :create]
	9	+
	10	+ # Load group projects
	11	+ before_filter :projects, except: [:new, :create]
	12	+
	13	+ def new
	14	+ @group = Group.new
	15	+ end
	16	+
	17	+ def create
	18	+ @group = Group.new(params[:group])
	19	+ @group.path = @group.name.dup.parameterize if @group.name
	20	+ @group.owner = current_user
	21	+
	22	+ if @group.save
	23	+ redirect_to @group, notice: 'Group was successfully created.'
	24	+ else
	25	+ render action: "new"
	26	+ end
	27	+ end
10	28
11	29	def show
12	30	@events = Event.in_projects(project_ids).limit(20).offset(params[:offset] \|\| 0)
...	...
...	...	@@ -39,7 +39,12 @@ module TabHelper
39	39	# Returns a list item element String
40	40	def nav_link(options = {}, &block)
41	41	if path = options.delete(:path)
42		- c, a, _ = path.split('#')
	42	+ if path.respond_to?(:each)
	43	+ c = path.map { \|p\| p.split('#').first }
	44	+ a = path.map { \|p\| p.split('#').last }
	45	+ else
	46	+ c, a, _ = path.split('#')
	47	+ end
43	48	else
44	49	c = options.delete(:controller)
45	50	a = options.delete(:action)
...	...
...	...	@@ -220,7 +220,7 @@ class User < ActiveRecord::Base
220	220	end
221	221
222	222	def can_create_group?
223		- is_admin?
	223	+ can_create_project?
224	224	end
225	225
226	226	def abilities
...	...
...	...	@@ -5,7 +5,7 @@
5	5	(#{groups.count})
6	6	- if current_user.can_create_group?
7	7	%span.right
8		- = link_to new_admin_group_path, class: "btn very_small info" do
	8	+ = link_to new_group_path, class: "btn very_small info" do
9	9	%i.icon-plus
10	10	New Group
11	11	%ul.well-list
...	...
...	...	@@ -0,0 +1,21 @@
	1	+%h3.page_title New Group
	2	+%hr
	3	+= form_for @group do \|f\|
	4	+ - if @group.errors.any?
	5	+ .alert-message.block-message.error
	6	+ %span= @group.errors.full_messages.first
	7	+ .clearfix
	8	+ = f.label :name do
	9	+ Group name is
	10	+ .input
	11	+ = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
	12	+
	13	+ = f.submit 'Create group', class: "btn primary"
	14	+ %hr
	15	+ .padded
	16	+ %ul
	17	+ %li Group is kind of directory for several projects
	18	+ %li All created groups are private
	19	+ %li People within a group see only projects they have access to
	20	+ %li All projects of group will be stored in group directory
	21	+ %li You will be able to move existing projects into group
...	...
...	...	@@ -17,7 +17,7 @@
17	17	= link_to new_project_path, title: "Create New Project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
18	18	%i.icon-plus
19	19	%li
20		- = link_to profile_path, title: "Your Profile", class: 'has_bottom_tooltip', 'data-original-title' => 'Your profile' do
	20	+ = link_to profile_path, title: "My Profile", class: 'has_bottom_tooltip', 'data-original-title' => 'Your profile' do
21	21	%i.icon-user
22	22	%li.separator
23	23	%li
...	...
...	...	@@ -15,6 +15,12 @@
15	15	%span Namespace
16	16	.input
17	17	= f.select :namespace_id, namespaces_options(params[:namespace_id] \|\| :current_user), {}, {class: 'chosen'}
	18	+ - elsif current_user.can_create_group?
	19	+ .clearfix
	20	+ .input.light
	21	+ Need a group for several projects?
	22	+ = link_to new_group_path, class: "btn very_small" do
	23	+ Create a group
18	24	%hr
19	25	%p.padded
20	26	New projects are private by default. You choose who can see the project and commit to repository.
...	...
...	...	@@ -0,0 +1,23 @@
	1	+.ui-box
	2	+ %h5.title
	3	+ Profile
	4	+ %ul.well-list
	5	+ %li
	6	+ %strong Email
	7	+ %span.right= mail_to @user.email
	8	+ - unless @user.skype.blank?
	9	+ %li
	10	+ %strong Skype
	11	+ %span.right= @user.skype
	12	+ - unless @user.linkedin.blank?
	13	+ %li
	14	+ %strong LinkedIn
	15	+ %span.right= @user.linkedin
	16	+ - unless @user.twitter.blank?
	17	+ %li
	18	+ %strong Twitter
	19	+ %span.right= @user.twitter
	20	+ - unless @user.bio.blank?
	21	+ %li
	22	+ %strong Bio
	23	+ %span.right= @user.bio
...	...
...	...	@@ -3,6 +3,11 @@
3	3	%h3.page_title
4	4	= image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
5	5	= @user.name
	6	+ - if @user == current_user
	7	+ .right
	8	+ = link_to profile_path, class: 'btn small' do
	9	+ %i.icon-edit
	10	+ Edit Profile
6	11	%br
7	12	%small @#{@user.username}
8	13	%br
...	...	@@ -12,26 +17,5 @@
12	17	%h5 Recent events
13	18	= render @events
14	19	.span4
15		- .ui-box
16		- %h5.title Profile
17		- %ul.well-list
18		- %li
19		- %strong Email
20		- %span.right= mail_to @user.email
21		- - unless @user.skype.blank?
22		- %li
23		- %strong Skype
24		- %span.right= @user.skype
25		- - unless @user.linkedin.blank?
26		- %li
27		- %strong LinkedIn
28		- %span.right= @user.linkedin
29		- - unless @user.twitter.blank?
30		- %li
31		- %strong Twitter
32		- %span.right= @user.twitter
33		- - unless @user.bio.blank?
34		- %li
35		- %strong Bio
36		- %span.right= @user.bio
	20	+ = render 'profile'
37	21	= render 'projects'
...	...
...	...	@@ -112,7 +112,7 @@ Gitlab::Application.routes.draw do
112	112	#
113	113	# Groups Area
114	114	#
115		- resources :groups, constraints: { id: /[^\/]+/ }, only: [:show] do
	115	+ resources :groups, constraints: { id: /[^\/]+/ }, only: [:show, :new, :create] do
116	116	member do
117	117	get :issues
118	118	get :merge_requests
...	...