teams refactoring and cleanup pt.1

Dmitriy Zaporozhets
1 parent 1c88fbb3
Showing 19 changed files with 39 additions and 126 deletions Show diff stats
app/controllers/teams_controller.rb
app/models/project.rb
app/views/layouts/user_team.html.haml
app/views/profiles/show.html.haml
app/views/teams/_team_head.html.haml
app/views/teams/edit.html.haml
app/views/teams/index.html.haml
app/views/teams/issues.html.haml
app/views/teams/members/edit.html.haml
app/views/teams/members/index.html.haml
app/views/teams/members/new.html.haml
app/views/teams/members/show.html.haml
app/views/teams/merge_requests.html.haml
app/views/teams/projects/edit.html.haml
app/views/teams/projects/index.html.haml
app/views/teams/projects/new.html.haml
app/views/teams/search.html.haml
app/views/teams/show.html.haml
config/routes.rb
@@ -64,16 +64,6 @@ class TeamsController &lt; ApplicationController
     @issues = @issues.includes(:author, :project)
   end
  
-  def search
-    result = SearchContext.new(user_team.project_ids, params).execute
-
-    @projects       = result[:projects]
-    @merge_requests = result[:merge_requests]
-    @issues         = result[:issues]
-    @wiki_pages     = result[:wiki_pages]
-    @teams          = result[:teams]
-  end
-
   protected
  
   def projects
@@ -80,7 +80,7 @@ class Project &lt; ActiveRecord::Base
   # Scopes
   scope :without_user, ->(user)  { where("id NOT IN (:ids)", ids: user.authorized_projects.map(&:id) ) }
   scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
-  scope :without_team, ->(team) { where("id NOT IN (:ids)", ids: team.projects.map(&:id)) }
+  scope :without_team, ->(team) { team.projects.present? ? where("id NOT IN (:ids)", ids: team.projects.map(&:id)) : scoped  }
   scope :in_team, ->(team) { where("id IN (:ids)", ids: team.projects.map(&:id)) }
   scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
   scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
@@ -19,18 +19,16 @@
             Merge Requests
             %span.count= MergeRequest.opened.of_user_team(@team).count
  
-        = nav_link(path: 'teams#search') do
-          = link_to "Search", search_team_path(@team)
-
         = nav_link(controller: [:members]) do
           = link_to team_members_path(@team), class: "team-tab tab" do
             Members
+            %span.count= @team.members.count
  
         - if can? current_user, :admin_user_team, @team
           = nav_link(controller: [:projects]) do
             = link_to team_projects_path(@team), class: "team-tab tab" do
-              %i.icon-briefcase
               Projects
+              %span.count= @team.projects.count
  
           = nav_link(path: 'teams#edit') do
             = link_to edit_team_path(@team), class: "stat-tab tab " do
@@ -31,6 +31,20 @@
         .controls
           = f.text_field :email, class: "input-xlarge", required: true
           %span.help-block We also use email for avatar detection.
+      .control-group
+        = f.label :skype, class: "control-label"
+        .controls= f.text_field :skype, class: "input-xlarge"
+      .control-group
+        = f.label :linkedin, class: "control-label"
+        .controls= f.text_field :linkedin, class: "input-xlarge"
+      .control-group
+        = f.label :twitter, class: "control-label"
+        .controls= f.text_field :twitter, class: "input-xlarge"
+      .control-group
+        = f.label :bio, class: "control-label"
+        .controls
+          = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
+          %span.help-block Tell us about yourself in fewer than 250 characters.
  
     .span5.right
       %fieldset.tips
@@ -59,24 +73,6 @@
                 Want to share a team between projects?
                 = link_to new_team_path, class: "btn very_small" do
                   Create a team
-
-  .row
-    .span7
-      .control-group
-        = f.label :skype, class: "control-label"
-        .controls= f.text_field :skype, class: "input-xlarge"
-      .control-group
-        = f.label :linkedin, class: "control-label"
-        .controls= f.text_field :linkedin, class: "input-xlarge"
-      .control-group
-        = f.label :twitter, class: "control-label"
-        .controls= f.text_field :twitter, class: "input-xlarge"
-      .control-group
-        = f.label :bio, class: "control-label"
-        .controls
-          = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
-          %span.help-block Tell us about yourself in fewer than 250 characters.
-    .span5.right
       %fieldset
         %legend
           Personal projects:
-= render "team_head"
-
 %h3.page_title= "Edit Team #{@team.name}"
 %hr
 = form_for @team, url: teams_path do |f|
@@ -1,38 +0,0 @@
-%h3.page_title
-  Teams
-  %small
-    list of all teams
-
-  = link_to 'New Team', new_team_path, class: "btn success small right"
-  %br
-
-= form_tag search_teams_path, method: :get, class: 'form-inline' do
-  = text_field_tag :name, params[:name], class: "xlarge"
-  = submit_tag "Search", class: "btn submit primary"
-
-%table.teams_list
-  %thead
-    %tr
-      %th
-        Name
-        %i.icon-sort-down
-      %th Path
-      %th Projects
-      %th Members
-      %th Owner
-      %th.cred Danger Zone!
-
-  - @teams.each do |team|
-    %tr
-      %td
-        %strong= link_to team.name, team_path(team)
-      %td= team.path
-      %td= link_to team.projects.count, team_projects_path(team)
-      %td= link_to team.members.count, team_members_path(team)
-      %td= link_to team.owner.name, team_member_path(team, team.owner)
-      %td.bgred
-        - if current_user.can?(:manage_user_team, team)
-          = link_to "Edit", edit_team_path(team), class: "btn small"
-          - if current_user.can?(:admin_user_team, team)
-            = link_to "Destroy", team_path(team), method: :delete, confirm: "You are shure?", class: "danger btn small"
-            &nbsp;
-= render "team_head"
-
 %h3.page_title
   Issues
   %small (in Team projects assigned to Team members)
-= render "teams/team_head"
-
-%h3
+%h3.page_title
   Edit access #{@member.name} in #{@team.name} team
  
 %hr
-= render "teams/team_head"
-
 %h3.page_title
   Team Members
   (#{@members.count})
-= render "teams/team_head"
-
 %h3.page_title
   Team: #{@team.name}
  
-= render "teams/team_head"
-
 - allow_admin = can? current_user, :admin_project, @project
 - user = @team_member.user
  
-= render "team_head"
-
 %h3.page_title
   Merge Requests
   %small (authored by or assigned to Team members)
-= render "teams/team_head"
-
 %h3
   Edit max access in #{@project.name} for #{@team.name} team
  
-= render "teams/team_head"
-
 %h3.page_title
   Assigned projects (#{@team.projects.count})
   %small
@@ -13,22 +11,26 @@
  
 %hr
  
-%table.projects-table
-  %thead
-    %tr
-      %th Project name
-      %th Max access
-      - if current_user.can?(:admin_user_team, @team)
-        %th.span3
+- if @team.projects.present?
+  %table.projects-table
+    %thead
+      %tr
+        %th Project name
+        %th Max access
+        - if current_user.can?(:admin_user_team, @team)
+          %th.span3
+
+    - @team.projects.each do |project|
+      %tr.project
+        %td
+          = link_to project.name_with_namespace, project_path(project)
+        %td
+          %span= @team.human_max_project_access(project)
  
-  - @team.projects.each do |project|
-    %tr.project
-      %td
-        = link_to project.name_with_namespace, project_path(project)
-      %td
-        %span= @team.human_max_project_access(project)
+        - if current_user.can?(:admin_user_team, @team)
+          %td.bgred
+            = link_to 'Edit max access', edit_team_project_path(@team, project), class: "btn small"
+            = link_to 'Relegate', team_project_path(@team, project), confirm: 'Remove project from team and move to global namespace. Are you sure?', method: :delete, class: "btn danger small"
  
-      - if current_user.can?(:admin_user_team, @team)
-        %td.bgred
-          = link_to 'Edit max access', edit_team_project_path(@team, project), class: "btn small"
-          = link_to 'Relegate', team_project_path(@team, project), confirm: 'Remove project from team and move to global namespace. Are you sure?', method: :delete, class: "btn danger small"
+- else
+  %p.nothing_here_message This team has no projects yet
-= render "teams/team_head"
-
 %h3.page_title
   Team: #{@team.name}
  
@@ -1,11 +0,0 @@
-= render "team_head"
-
-= form_tag search_team_path(@team), method: :get, class: 'form-inline' do |f|
-  .padded
-    = label_tag :search do
-      %strong Looking for
-    .input
-      = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search"
-      = submit_tag 'Search', class: "btn primary wide"
-- if params[:search].present?
-  = render 'search/result'
-= render "team_head"
-
 .projects
   .activities.span8
     = link_to dashboard_path, class: 'btn very_small' do
@@ -142,15 +142,11 @@ Gitlab::Application.routes.draw do
     member do
       get :issues
       get :merge_requests
-      get :search
     end
     scope module: :teams do
       resources :members,   only: [:index, :new, :create, :edit, :update, :destroy]
       resources :projects,  only: [:index, :new, :create, :edit, :update, :destroy], constraints: { id: /[a-zA-Z.0-9_\-\/]+/ }
     end
-    collection do
-      get :search
-    end
   end
  
   resources :projects, constraints: { id: /[^\/]+/ }, only: [:new, :create]
...	...	@@ -64,16 +64,6 @@ class TeamsController < ApplicationController
64	64	@issues = @issues.includes(:author, :project)
65	65	end
66	66
67		- def search
68		- result = SearchContext.new(user_team.project_ids, params).execute
69		-
70		- @projects = result[:projects]
71		- @merge_requests = result[:merge_requests]
72		- @issues = result[:issues]
73		- @wiki_pages = result[:wiki_pages]
74		- @teams = result[:teams]
75		- end
76		-
77	67	protected
78	68
79	69	def projects
...	...
...	...	@@ -80,7 +80,7 @@ class Project < ActiveRecord::Base
80	80	# Scopes
81	81	scope :without_user, ->(user) { where("id NOT IN (:ids)", ids: user.authorized_projects.map(&:id) ) }
82	82	scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
83		- scope :without_team, ->(team) { where("id NOT IN (:ids)", ids: team.projects.map(&:id)) }
	83	+ scope :without_team, ->(team) { team.projects.present? ? where("id NOT IN (:ids)", ids: team.projects.map(&:id)) : scoped }
84	84	scope :in_team, ->(team) { where("id IN (:ids)", ids: team.projects.map(&:id)) }
85	85	scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
86	86	scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
...	...
...	...	@@ -19,18 +19,16 @@
19	19	Merge Requests
20	20	%span.count= MergeRequest.opened.of_user_team(@team).count
21	21
22		- = nav_link(path: 'teams#search') do
23		- = link_to "Search", search_team_path(@team)
24		-
25	22	= nav_link(controller: [:members]) do
26	23	= link_to team_members_path(@team), class: "team-tab tab" do
27	24	Members
	25	+ %span.count= @team.members.count
28	26
29	27	- if can? current_user, :admin_user_team, @team
30	28	= nav_link(controller: [:projects]) do
31	29	= link_to team_projects_path(@team), class: "team-tab tab" do
32		- %i.icon-briefcase
33	30	Projects
	31	+ %span.count= @team.projects.count
34	32
35	33	= nav_link(path: 'teams#edit') do
36	34	= link_to edit_team_path(@team), class: "stat-tab tab " do
...	...
...	...	@@ -31,6 +31,20 @@
31	31	.controls
32	32	= f.text_field :email, class: "input-xlarge", required: true
33	33	%span.help-block We also use email for avatar detection.
	34	+ .control-group
	35	+ = f.label :skype, class: "control-label"
	36	+ .controls= f.text_field :skype, class: "input-xlarge"
	37	+ .control-group
	38	+ = f.label :linkedin, class: "control-label"
	39	+ .controls= f.text_field :linkedin, class: "input-xlarge"
	40	+ .control-group
	41	+ = f.label :twitter, class: "control-label"
	42	+ .controls= f.text_field :twitter, class: "input-xlarge"
	43	+ .control-group
	44	+ = f.label :bio, class: "control-label"
	45	+ .controls
	46	+ = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
	47	+ %span.help-block Tell us about yourself in fewer than 250 characters.
34	48
35	49	.span5.right
36	50	%fieldset.tips
...	...	@@ -59,24 +73,6 @@
59	73	Want to share a team between projects?
60	74	= link_to new_team_path, class: "btn very_small" do
61	75	Create a team
62		-
63		- .row
64		- .span7
65		- .control-group
66		- = f.label :skype, class: "control-label"
67		- .controls= f.text_field :skype, class: "input-xlarge"
68		- .control-group
69		- = f.label :linkedin, class: "control-label"
70		- .controls= f.text_field :linkedin, class: "input-xlarge"
71		- .control-group
72		- = f.label :twitter, class: "control-label"
73		- .controls= f.text_field :twitter, class: "input-xlarge"
74		- .control-group
75		- = f.label :bio, class: "control-label"
76		- .controls
77		- = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
78		- %span.help-block Tell us about yourself in fewer than 250 characters.
79		- .span5.right
80	76	%fieldset
81	77	%legend
82	78	Personal projects:
...	...
1		-= render "team_head"
2		-
3	1	%h3.page_title= "Edit Team #{@team.name}"
4	2	%hr
5	3	= form_for @team, url: teams_path do \|f\|
...	...
...	...	@@ -1,38 +0,0 @@
1		-%h3.page_title
2		- Teams
3		- %small
4		- list of all teams
5		-
6		- = link_to 'New Team', new_team_path, class: "btn success small right"
7		- %br
8		-
9		-= form_tag search_teams_path, method: :get, class: 'form-inline' do
10		- = text_field_tag :name, params[:name], class: "xlarge"
11		- = submit_tag "Search", class: "btn submit primary"
12		-
13		-%table.teams_list
14		- %thead
15		- %tr
16		- %th
17		- Name
18		- %i.icon-sort-down
19		- %th Path
20		- %th Projects
21		- %th Members
22		- %th Owner
23		- %th.cred Danger Zone!
24		-
25		- - @teams.each do \|team\|
26		- %tr
27		- %td
28		- %strong= link_to team.name, team_path(team)
29		- %td= team.path
30		- %td= link_to team.projects.count, team_projects_path(team)
31		- %td= link_to team.members.count, team_members_path(team)
32		- %td= link_to team.owner.name, team_member_path(team, team.owner)
33		- %td.bgred
34		- - if current_user.can?(:manage_user_team, team)
35		- = link_to "Edit", edit_team_path(team), class: "btn small"
36		- - if current_user.can?(:admin_user_team, team)
37		- = link_to "Destroy", team_path(team), method: :delete, confirm: "You are shure?", class: "danger btn small"
38		-
1		-= render "team_head"
2		-
3	1	%h3.page_title
4	2	Issues
5	3	%small (in Team projects assigned to Team members)
...	...
1		-= render "teams/team_head"
2		-
3		-%h3
	1	+%h3.page_title
4	2	Edit access #{@member.name} in #{@team.name} team
5	3
6	4	%hr
...	...
1		-= render "teams/team_head"
2		-
3	1	%h3.page_title
4	2	Team Members
5	3	(#{@members.count})
...	...
1		-= render "teams/team_head"
2		-
3	1	%h3.page_title
4	2	Team: #{@team.name}
5	3
...	...