Fix group assoc. Show namespace in project list

Dmitriy Zaporozhets
1 parent 65c470e8
Showing 2 changed files with 6 additions and 2 deletions Show diff stats
app/models/project.rb
app/views/dashboard/_projects.html.haml
@@ -34,7 +34,7 @@ class Project &lt; 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
	@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base		@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base
34	attr_accessor :error_code	34	attr_accessor :error_code
35		35
36	# Relations	36	# Relations
37	- belongs_to :group, foreign_key: "namespace_id", conditions: 'type = Group'	37	+ belongs_to :group, foreign_key: "namespace_id", conditions: "type = 'Group'"
38	belongs_to :namespace	38	belongs_to :namespace
39	belongs_to :owner, class_name: "User"	39	belongs_to :owner, class_name: "User"
40	has_many :users, through: :users_projects	40	has_many :users, through: :users_projects