Enable global time logging at /time_entries/new (#10020).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8691 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
94b621a99f
commit
41eab6615b
6 files changed
+130
-9
No files matched your search
@@ -2,6 +2,13 @@
|
||||
<%= back_url_hidden_field_tag %>
|
||||
|
||||
<div class="box tabular">
|
||||
<% if @time_entry.new_record? %>
|
||||
<% if params[:project_id] %>
|
||||
<%= f.hidden_field :project_id %>
|
||||
<% else %>
|
||||
<p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %></p>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
|
||||
<p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
|
||||
<p><%= f.text_field :hours, :size => 6, :required => true %></p>
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<div class="contextual">
|
||||
<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
|
||||
<%= link_to l(:button_log_time),
|
||||
{:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue},
|
||||
:class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
|
||||
</div>
|
||||
|
||||
<%= render_timelog_breadcrumb %>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<h2><%= l(:label_spent_time) %></h2>
|
||||
|
||||
<% labelled_form_for @time_entry, :url => project_time_entries_path(@time_entry.project) do |f| %>
|
||||
<% labelled_form_for @time_entry, :url => time_entries_path do |f| %>
|
||||
<%= render :partial => 'form', :locals => {:f => f} %>
|
||||
<%= submit_tag l(:button_create) %>
|
||||
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
|
||||
|
||||
Reference in new issue
Block a user