Fix routing. Finalize user show page
This commit is contained in:
parent
70690e1971
commit
96d97c4857
5 changed files with 31 additions and 14 deletions
|
@ -1,6 +1,6 @@
|
||||||
class UsersController < ApplicationController
|
class UsersController < ApplicationController
|
||||||
def show
|
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))
|
@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)
|
@events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,6 +21,10 @@ class Team
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get_tm user_id
|
||||||
|
project.users_projects.find_by_user_id(user_id)
|
||||||
|
end
|
||||||
|
|
||||||
def add_user(user, access)
|
def add_user(user, access)
|
||||||
add_users_ids([user.id], access)
|
add_users_ids([user.id], access)
|
||||||
end
|
end
|
||||||
|
|
20
app/views/users/_projects.html.haml
Normal file
20
app/views/users/_projects.html.haml
Normal file
|
@ -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
|
||||||
|
– user is a project owner
|
|
@ -3,7 +3,10 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
= image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
|
= image_tag gravatar_icon(@user.email, 90), class: "avatar s90"
|
||||||
= @user.name
|
= @user.name
|
||||||
%span.light (@#{@user.username})
|
%br
|
||||||
|
%small @#{@user.username}
|
||||||
|
%br
|
||||||
|
%small member since #{@user.created_at.stamp("Nov 12, 2031")}
|
||||||
.clearfix
|
.clearfix
|
||||||
%hr
|
%hr
|
||||||
%h5 Recent events
|
%h5 Recent events
|
||||||
|
@ -31,14 +34,4 @@
|
||||||
%li
|
%li
|
||||||
%strong Bio
|
%strong Bio
|
||||||
%span.right= @user.bio
|
%span.right= @user.bio
|
||||||
.ui-box
|
= render 'projects'
|
||||||
%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)
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ Gitlab::Application.routes.draw do
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :keys
|
resources :keys
|
||||||
match "/u/:username" => "users#show", as: :user
|
match "/u/:username" => "users#show", as: :user, constraints: { username: /.*/ }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue