summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-04-02 20:17:02 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-04-02 20:17:02 +0000
commit6e1b9326e44b58fd5120d6b7a6dbbc93c08e3323 (patch)
treef79ce0557d974710674597d69cf496332aa3def3 /app/views
parent3c8a38212eb69265a89ceb5a5c67403aaedd36e7 (diff)
downloadredmine-6e1b9326e44b58fd5120d6b7a6dbbc93c08e3323.tar.gz
redmine-6e1b9326e44b58fd5120d6b7a6dbbc93c08e3323.zip
Added parent project name (if it exists) on project list and project overview.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@404 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/list.rhtml6
-rw-r--r--app/views/projects/show.rhtml3
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index 5e1a63f95..f83dc0d06 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -2,15 +2,17 @@
<table class="list">
<thead><tr>
- <%= sort_header_tag('name', :caption => l(:label_project)) %>
+ <%= sort_header_tag("#{Project.table_name}.name", :caption => l(:label_project)) %>
<th><%=l(:field_description)%></th>
- <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+ <th><%=l(:field_parent)%></th>
+ <%= sort_header_tag("#{Project.table_name}.created_on", :caption => l(:field_created_on)) %>
</tr></thead>
<tbody>
<% for project in @projects %>
<tr class="<%= cycle("odd", "even") %>">
<td><%= link_to project.name, :action => 'show', :id => project %></td>
<td><%=h project.description %></td>
+ <td><%= link_to(project.parent.name, :action => 'show', :id => project.parent) unless project.parent.nil? %></td>
<td align="center"><%= format_date(project.created_on) %></td>
</tr>
<% end %>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 8b0501585..98259f1f8 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -9,6 +9,9 @@
<ul>
<% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
+ <% unless @project.parent.nil? %>
+ <li><%=l(:field_parent)%>: <%= link_to @project.parent.name, :controller => 'projects', :action => 'show', :id => @project.parent %></li>
+ <% end %>
<% for custom_value in @custom_values %>
<% if !custom_value.value.empty? %>
<li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>