project admin area - show project name with namespace
This commit is contained in:
parent
ae282f6326
commit
1d857aae17
|
@ -259,4 +259,14 @@ class Project < ActiveRecord::Base
|
|||
save!
|
||||
end
|
||||
end
|
||||
|
||||
def name_with_namespace
|
||||
@name_with_namespace ||= begin
|
||||
if namespace
|
||||
namespace.human_name + " / " + name
|
||||
else
|
||||
name
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
= link_to 'New Project', new_project_path, class: "btn small right"
|
||||
%br
|
||||
= form_tag admin_projects_path, method: :get, class: 'form-inline' do
|
||||
= select_tag :namespace_id, namespaces_options(params[:namespace_id], :all), class: "chosen xlarge", include_blank: true
|
||||
= select_tag :namespace_id, namespaces_options(params[:namespace_id], :all), class: "chosen xlarge", prompt: "Project namespace"
|
||||
= text_field_tag :name, params[:name], class: "xlarge"
|
||||
= submit_tag "Search", class: "btn submit primary"
|
||||
|
||||
%table
|
||||
%thead
|
||||
%th Name
|
||||
%th Project
|
||||
%th Path
|
||||
%th Team Members
|
||||
%th Last Commit
|
||||
%th Edit
|
||||
|
@ -20,10 +20,7 @@
|
|||
- @projects.each do |project|
|
||||
%tr
|
||||
%td
|
||||
- if project.namespace
|
||||
= link_to project.namespace.human_name, [:admin, project]
|
||||
→
|
||||
= link_to project.name, [:admin, project]
|
||||
= link_to project.name_with_namespace, [:admin, project]
|
||||
%td
|
||||
%span.monospace= project.path_with_namespace + ".git"
|
||||
%td= project.users_projects.count
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
= render 'admin/shared/projects_head'
|
||||
%h3.page_title
|
||||
Project: #{@project.name}
|
||||
Project: #{@project.name_with_namespace}
|
||||
= link_to edit_admin_project_path(@project), class: "btn right" do
|
||||
%i.icon-edit
|
||||
Edit
|
||||
|
|
Loading…
Reference in a new issue