routes_fix.patch

Routes cleanup - Etienne Massip, 2011-12-13 13:17

Download (2.95 KB)

View differences:

app/views/admin/projects.rhtml Thu Jan 15 10:14:12 1970
81 81
    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
82 82
    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
83 83
    <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
84
    <%= link_to(l(:button_delete), project_destroy_confirm_path(project), :class => 'icon icon-del') %>
84
    <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
85 85
  </td>
86 86
  </tr>
87 87
<% end %>
88
-- app/views/projects/index.rhtml	Thu Jan 15 10:14:12 1970
88
++ app/views/projects/index.rhtml	Thu Jan 15 10:14:12 1970
......
8 8
      <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.admin? %>
9 9
    <% end %>
10 10
    <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
11
    <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
11
    <%= link_to(l(:label_overall_spent_time), { :controller => 'timelog' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
12 12
    <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
13 13
</div>
14 14

  
15
-- app/views/projects/show.rhtml	Thu Jan 15 10:14:12 1970
15
++ app/views/projects/show.rhtml	Thu Jan 15 10:14:12 1970
......
116 116
    <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
117 117
    <h3><%= l(:label_spent_time) %></h3>
118 118
    <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
119
    <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
119
    <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |
120 120
    <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
121 121
    <% end %>
122 122
<% end %>
123 123

  
124 124
<% content_for :header_tags do %>
125
<%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
125
<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
126 126
<% end %>
127 127

  
128 128
<% html_title(l(:label_overview)) -%>