Commit 70edf950 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Show contributed projects on user page and stars for it

parent d905a431
...@@ -8,6 +8,9 @@ class UsersController < ApplicationController ...@@ -8,6 +8,9 @@ class UsersController < ApplicationController
visible_projects = ProjectsFinder.new.execute(current_user) visible_projects = ProjectsFinder.new.execute(current_user)
authorized_projects_ids = visible_projects.pluck(:id) authorized_projects_ids = visible_projects.pluck(:id)
@contributed_projects = Project.where(id: authorized_projects_ids).
in_group_namespace
@projects = @user.personal_projects. @projects = @user.personal_projects.
where(id: authorized_projects_ids) where(id: authorized_projects_ids)
......
...@@ -3,11 +3,9 @@ ...@@ -3,11 +3,9 @@
.project-access-icon .project-access-icon
= visibility_level_icon(project.visibility_level) = visibility_level_icon(project.visibility_level)
= link_to project.name_with_namespace, project = link_to project.name_with_namespace, project
%span.pull-right
- if current_page?(starred_explore_projects_path) %i.fa.fa-star
%strong.pull-right = project.star_count
%i.fa.fa-star
= pluralize project.star_count, 'star'
.project-info .project-info
- if project.description.present? - if project.description.present?
......
.panel.panel-default - if @contributed_projects.present?
.panel-heading Personal projects .panel.panel-default
%ul.well-list .panel-heading Projects contributed to
- projects.each do |project| %ul.well-list
%li - @contributed_projects.sort_by(&:star_count).reverse.each do |project|
= link_to_project project %li
= link_to_project project
%span.pull-right.light
%i.fa.fa-star
= project.star_count
- if @projects.present?
.panel.panel-default
.panel-heading Personal projects
%ul.well-list
- @projects.sort_by(&:star_count).reverse.each do |project|
%li
= link_to_project project
%span.pull-right.light
%i.fa.fa-star
= project.star_count
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
= render @events = render @events
.col-md-4 .col-md-4
= render 'profile', user: @user = render 'profile', user: @user
- if @projects.present? = render 'projects'
= render 'projects', projects: @projects
:coffeescript :coffeescript
$ -> $ ->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment