Commit 2f22874b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix group assoc. Show namespace in project list

parent bea3c6f4d83f
......@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base
attr_accessor :error_code
# 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 :owner, class_name: "User"
has_many :users, through: :users_projects
......
......@@ -12,7 +12,11 @@
- projects.each do |project|
%li.wll
= 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
&rarr;
%span.last_activity
......
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