diff --git a/app/models/project.rb b/app/models/project.rb index 4125456d..89618a18 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -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 diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index 00f19ccd..a2031861 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -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 → %span.last_activity