diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index badc808a2..53690a4a9 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -6,7 +6,8 @@ class ProjectsController < ApplicationController def index @projects = Project.visible_to(current_user).paginate(:page => params[:project_page]) - @own_projects = current_user.projects + @own_projects = current_user.own_projects + @part_projects = current_user.projects - @own_projects end def show diff --git a/app/views/projects/_own_projects_sidebar.html.haml b/app/views/projects/_own_projects_sidebar.html.haml index 8f0da0f06..42ad74d6b 100644 --- a/app/views/projects/_own_projects_sidebar.html.haml +++ b/app/views/projects/_own_projects_sidebar.html.haml @@ -5,6 +5,12 @@ %ul - @own_projects.each do |project| %li - = project.name - - if (project.owner == current_user) - = '(' + t("layout.owner") + ')' + = link_to project_path(project), project.uname +.block.notice + %h3= t("layout.users.part_projects") + .content + %p + %ul + - @part_projects.each do |project| + %li + = link_to(project.owner.uname, user_path(project.owner)) + "/" + link_to(project.unixname + ' (' + project.name + ')', project_path(project)) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 77f72fafe..82ad23ca0 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -246,6 +246,7 @@ ru: back_to_the_list: ⇐ К списку пользователей confirm_delete: Вы уверены, что хотите удалить этого пользователя? own_projects: Мои проекты + part_projects: Участвую в проектах git: repositories: