Refactor: rename TimelogController#details to #index
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4235 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -18,9 +18,9 @@
|
||||
class TimelogController < ApplicationController
|
||||
menu_item :issues
|
||||
before_filter :find_project, :authorize, :only => [:edit, :destroy]
|
||||
before_filter :find_optional_project, :only => [:details]
|
||||
before_filter :find_optional_project, :only => [:index]
|
||||
|
||||
verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
|
||||
verify :method => :post, :only => :destroy, :redirect_to => { :action => :index }
|
||||
|
||||
helper :sort
|
||||
include SortHelper
|
||||
@@ -29,7 +29,7 @@ class TimelogController < ApplicationController
|
||||
helper :custom_fields
|
||||
include CustomFieldsHelper
|
||||
|
||||
def details
|
||||
def index
|
||||
sort_init 'spent_on', 'desc'
|
||||
sort_update 'spent_on' => 'spent_on',
|
||||
'user' => 'user_id',
|
||||
@@ -95,7 +95,7 @@ class TimelogController < ApplicationController
|
||||
|
||||
if request.post? and @time_entry.save
|
||||
flash[:notice] = l(:notice_successful_update)
|
||||
redirect_back_or_default :action => 'details', :project_id => @time_entry.project
|
||||
redirect_back_or_default :action => 'index', :project_id => @time_entry.project
|
||||
return
|
||||
end
|
||||
end
|
||||
@@ -110,7 +110,7 @@ class TimelogController < ApplicationController
|
||||
end
|
||||
redirect_to :back
|
||||
rescue ::ActionController::RedirectBackError
|
||||
redirect_to :action => 'details', :project_id => @time_entry.project
|
||||
redirect_to :action => 'index', :project_id => @time_entry.project
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
|
||||
<% if User.current.allowed_to?(:view_time_entries, @project) %>
|
||||
<th class="spent-time"><%=l(:label_spent_time)%>:</th>
|
||||
<td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'details', :project_id => @project, :issue_id => @issue}) : "-" %></td>
|
||||
<td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
<% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
|
||||
<h3><%= l(:label_spent_time) %></h3>
|
||||
<p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
|
||||
<p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
|
||||
<p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |
|
||||
<%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p>
|
||||
<% end %>
|
||||
<%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
<div class="tabs">
|
||||
<% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
|
||||
<ul>
|
||||
<li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'details', :project_id => @project, :issue_id => @issue }),
|
||||
:class => (@controller.action_name == 'details' ? 'selected' : nil)) %></li>
|
||||
<li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
|
||||
:class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
|
||||
<li><%= link_to(l(:label_report), url_params.merge({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}),
|
||||
:class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user