Fix routing. Finalize user show page

Dmitriy Zaporozhets
1 parent 70690e19
Showing 5 changed files with 31 additions and 14 deletions Show diff stats
app/controllers/users_controller.rb
app/models/team.rb
app/views/users/_projects.html.haml
app/views/users/show.html.haml
config/routes.rb
 class UsersController < ApplicationController
   def show
-    @user = User.find_by_username(params[:username])
+    @user = User.find_by_username!(params[:username])
     @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id))
     @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
   end
@@ -21,6 +21,10 @@ class Team
     end
   end
  
+  def get_tm user_id
+    project.users_projects.find_by_user_id(user_id)
+  end
+
   def add_user(user, access)
     add_users_ids([user.id], access)
   end
@@ -0,0 +1,20 @@
+.ui-box
+  %h5.title Projects
+  %ul.well-list
+    - @projects.each do |project|
+      %li
+        = link_to project_path(project), class: dom_class(project) do
+          - if project.namespace
+            = project.namespace.human_name
+            \/
+          %strong.well-title
+            = truncate(project.name, length: 45)
+          %span.right.light
+            - if project.owner == @user
+              %i.icon-wrench
+            - tm = project.team.get_tm(@user.id)
+            - if tm
+              = tm.project_access_human
+%p.light
+  %i.icon-wrench
+  &ndash; user is a project owner
@@ -3,7 +3,10 @@
     %h3.page_title
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
       = @user.name
-      %span.light (@#{@user.username})
+      %br
+      %small @#{@user.username}
+      %br
+      %small member since #{@user.created_at.stamp("Nov 12, 2031")}
     .clearfix
     %hr
     %h5 Recent events
@@ -31,14 +34,4 @@
           %li
             %strong Bio
             %span.right= @user.bio
-    .ui-box
-      %h5.title Projects
-      %ul.well-list
-        - @projects.each do |project|
-          %li
-            = link_to project_path(project), class: dom_class(project) do
-              - if project.namespace
-                = project.namespace.human_name
-                \/
-              %strong.well-title
-                = truncate(project.name, length: 45)
+    = render 'projects'
@@ -97,7 +97,7 @@ Gitlab::Application.routes.draw do
   end
  
   resources :keys
-  match "/u/:username" => "users#show", as: :user
+  match "/u/:username" => "users#show", as: :user, constraints: { username: /.*/ }
1	1	class UsersController < ApplicationController
2	2	def show
3		- @user = User.find_by_username(params[:username])
	3	+ @user = User.find_by_username!(params[:username])
4	4	@projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id))
5	5	@events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
6	6	end
...	...
...	...	@@ -21,6 +21,10 @@ class Team
21	21	end
22	22	end
23	23
	24	+ def get_tm user_id
	25	+ project.users_projects.find_by_user_id(user_id)
	26	+ end
	27	+
24	28	def add_user(user, access)
25	29	add_users_ids([user.id], access)
26	30	end
...	...
...	...	@@ -0,0 +1,20 @@
	1	+.ui-box
	2	+ %h5.title Projects
	3	+ %ul.well-list
	4	+ - @projects.each do \|project\|
	5	+ %li
	6	+ = link_to project_path(project), class: dom_class(project) do
	7	+ - if project.namespace
	8	+ = project.namespace.human_name
	9	+ \/
	10	+ %strong.well-title
	11	+ = truncate(project.name, length: 45)
	12	+ %span.right.light
	13	+ - if project.owner == @user
	14	+ %i.icon-wrench
	15	+ - tm = project.team.get_tm(@user.id)
	16	+ - if tm
	17	+ = tm.project_access_human
	18	+%p.light
	19	+ %i.icon-wrench
	20	+ – user is a project owner
...	...
...	...	@@ -3,7 +3,10 @@
3	3	%h3.page_title
4	4	= image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
5	5	= @user.name
6		- %span.light (@#{@user.username})
	6	+ %br
	7	+ %small @#{@user.username}
	8	+ %br
	9	+ %small member since #{@user.created_at.stamp("Nov 12, 2031")}
7	10	.clearfix
8	11	%hr
9	12	%h5 Recent events
...	...	@@ -31,14 +34,4 @@
31	34	%li
32	35	%strong Bio
33	36	%span.right= @user.bio
34		- .ui-box
35		- %h5.title Projects
36		- %ul.well-list
37		- - @projects.each do \|project\|
38		- %li
39		- = link_to project_path(project), class: dom_class(project) do
40		- - if project.namespace
41		- = project.namespace.human_name
42		- \/
43		- %strong.well-title
44		- = truncate(project.name, length: 45)
	37	+ = render 'projects'
...	...
...	...	@@ -97,7 +97,7 @@ Gitlab::Application.routes.draw do
97	97	end
98	98
99	99	resources :keys
100		- match "/u/:username" => "users#show", as: :user
	100	+ match "/u/:username" => "users#show", as: :user, constraints: { username: /.*/ }
101	101
102	102
103	103
...	...