Add a link to the cross project time entries page to /projects. #4935
Contributed by Jan. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3802 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
4083e7e622
commit
116c7a7964
|
@ -5,6 +5,7 @@
|
||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
|
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
|
||||||
<%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
|
<%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
|
||||||
|
<%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
|
||||||
<%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
|
<%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -646,6 +646,7 @@ de:
|
||||||
label_changes_details: Details aller Änderungen
|
label_changes_details: Details aller Änderungen
|
||||||
label_issue_tracking: Tickets
|
label_issue_tracking: Tickets
|
||||||
label_spent_time: Aufgewendete Zeit
|
label_spent_time: Aufgewendete Zeit
|
||||||
|
label_overall_spent_time: Aufgewendete Zeit aller Projekte anzeigen
|
||||||
label_f_hour: "{{value}} Stunde"
|
label_f_hour: "{{value}} Stunde"
|
||||||
label_f_hour_plural: "{{value}} Stunden"
|
label_f_hour_plural: "{{value}} Stunden"
|
||||||
label_time_tracking: Zeiterfassung
|
label_time_tracking: Zeiterfassung
|
||||||
|
|
|
@ -638,6 +638,7 @@ en:
|
||||||
label_changes_details: Details of all changes
|
label_changes_details: Details of all changes
|
||||||
label_issue_tracking: Issue tracking
|
label_issue_tracking: Issue tracking
|
||||||
label_spent_time: Spent time
|
label_spent_time: Spent time
|
||||||
|
label_overall_spent_time: Overall spent time
|
||||||
label_f_hour: "{{value}} hour"
|
label_f_hour: "{{value}} hour"
|
||||||
label_f_hour_plural: "{{value}} hours"
|
label_f_hour_plural: "{{value}} hours"
|
||||||
label_time_tracking: Time tracking
|
label_time_tracking: Time tracking
|
||||||
|
|
|
@ -60,6 +60,33 @@ class ProjectsControllerTest < ActionController::TestCase
|
||||||
assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
|
assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "#index" do
|
||||||
|
context "by non-admin user with view_time_entries permission" do
|
||||||
|
setup do
|
||||||
|
@request.session[:user_id] = 3
|
||||||
|
end
|
||||||
|
should "show overall spent time link" do
|
||||||
|
get :index
|
||||||
|
assert_template 'index'
|
||||||
|
assert_tag :a, :attributes => {:href => '/time_entries'}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "by non-admin user without view_time_entries permission" do
|
||||||
|
setup do
|
||||||
|
Role.find(2).remove_permission! :view_time_entries
|
||||||
|
Role.non_member.remove_permission! :view_time_entries
|
||||||
|
Role.anonymous.remove_permission! :view_time_entries
|
||||||
|
@request.session[:user_id] = 3
|
||||||
|
end
|
||||||
|
should "not show overall spent time link" do
|
||||||
|
get :index
|
||||||
|
assert_template 'index'
|
||||||
|
assert_no_tag :a, :attributes => {:href => '/time_entries'}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context "#add" do
|
context "#add" do
|
||||||
context "by admin user" do
|
context "by admin user" do
|
||||||
setup do
|
setup do
|
||||||
|
|
Loading…
Reference in New Issue