deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix group assoc. Show namespace in project list

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-24 22:39:51 +02:00
parent 65c470e843
commit 2f22874ba6
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -34,7 +34,7 @@ class Project < ActiveRecord::Base
attr_accessor :error_code attr_accessor :error_code
# Relations # Relations
belongs_to :group, foreign_key: "namespace_id", conditions: 'type = Group' belongs_to :group, foreign_key: "namespace_id", conditions: "type = 'Group'"
belongs_to :namespace belongs_to :namespace
belongs_to :owner, class_name: "User" belongs_to :owner, class_name: "User"
has_many :users, through: :users_projects has_many :users, through: :users_projects

6
app/views/dashboard/_projects.html.haml
View file

@ -12,7 +12,11 @@
- projects.each do |project| - projects.each do |project|
%li.wll %li.wll
= link_to project_path(project), class: dom_class(project) do = link_to project_path(project), class: dom_class(project) do
%strong.project_name= truncate(project.name, length: 25) - if project.namespace
= project.namespace.human_name
\/
%strong.project_name
= truncate(project.name, length: 25)
%span.arrow %span.arrow
&rarr; &rarr;
%span.last_activity %span.last_activity