diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-21 14:26:51 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-21 14:26:51 +0000 |
commit | 41eab6615b31185831b110b5e3d29dc08cefceca (patch) | |
tree | 1d4e9b3ab4c4eb36052e1d6d8cf6a6953d19c772 /app/views/timelog | |
parent | 94b621a99fd57462a6dd641044f62b7ecb67ccc2 (diff) | |
download | redmine-41eab6615b31185831b110b5e3d29dc08cefceca.tar.gz redmine-41eab6615b31185831b110b5e3d29dc08cefceca.zip |
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
Diffstat (limited to 'app/views/timelog')
-rw-r--r-- | app/views/timelog/_form.html.erb | 7 | ||||
-rw-r--r-- | app/views/timelog/index.html.erb | 4 | ||||
-rw-r--r-- | app/views/timelog/new.html.erb | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb index 9f7e28096..258de205f 100644 --- a/app/views/timelog/_form.html.erb +++ b/app/views/timelog/_form.html.erb @@ -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> diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index 55739412c..c3a63436e 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -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 %> diff --git a/app/views/timelog/new.html.erb b/app/views/timelog/new.html.erb index 6871c5f23..f37574397 100644 --- a/app/views/timelog/new.html.erb +++ b/app/views/timelog/new.html.erb @@ -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' %> |