Commit 1d857aae authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

project admin area - show project name with namespace

parent ae282f63
...@@ -259,4 +259,14 @@ class Project < ActiveRecord::Base ...@@ -259,4 +259,14 @@ class Project < ActiveRecord::Base
save! save!
end end
end end
def name_with_namespace
@name_with_namespace ||= begin
if namespace
namespace.human_name + " / " + name
else
name
end
end
end
end end
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
= link_to 'New Project', new_project_path, class: "btn small right" = link_to 'New Project', new_project_path, class: "btn small right"
%br %br
= form_tag admin_projects_path, method: :get, class: 'form-inline' do = 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" = text_field_tag :name, params[:name], class: "xlarge"
= submit_tag "Search", class: "btn submit primary" = submit_tag "Search", class: "btn submit primary"
%table %table
%thead %thead
%th Name %th Name
%th Project %th Path
%th Team Members %th Team Members
%th Last Commit %th Last Commit
%th Edit %th Edit
...@@ -20,10 +20,7 @@ ...@@ -20,10 +20,7 @@
- @projects.each do |project| - @projects.each do |project|
%tr %tr
%td %td
- if project.namespace = link_to project.name_with_namespace, [:admin, project]
= link_to project.namespace.human_name, [:admin, project]
&rarr;
= link_to project.name, [:admin, project]
%td %td
%span.monospace= project.path_with_namespace + ".git" %span.monospace= project.path_with_namespace + ".git"
%td= project.users_projects.count %td= project.users_projects.count
......
= render 'admin/shared/projects_head' = render 'admin/shared/projects_head'
%h3.page_title %h3.page_title
Project: #{@project.name} Project: #{@project.name_with_namespace}
= link_to edit_admin_project_path(@project), class: "btn right" do = link_to edit_admin_project_path(@project), class: "btn right" do
%i.icon-edit %i.icon-edit
Edit Edit
......
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