annotate .svn/pristine/99/997184000368211e968189a862af8cf1d5978fee.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents 038ba2d95de8
children
rev   line source
Chris@1296 1 <%= error_messages_for 'time_entry' %>
Chris@1296 2 <%= back_url_hidden_field_tag %>
Chris@1296 3
Chris@1296 4 <div class="box tabular">
Chris@1296 5 <% if @time_entry.new_record? %>
Chris@1296 6 <% if params[:project_id] || @time_entry.issue %>
Chris@1296 7 <%= f.hidden_field :project_id %>
Chris@1296 8 <% else %>
Chris@1296 9 <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %></p>
Chris@1296 10 <% end %>
Chris@1296 11 <% end %>
Chris@1296 12 <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>
Chris@1296 13 <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
Chris@1296 14 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
Chris@1296 15 <p><%= f.text_field :comments, :size => 100 %></p>
Chris@1296 16 <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
Chris@1296 17 <% @time_entry.custom_field_values.each do |value| %>
Chris@1296 18 <p><%= custom_field_tag_with_label :time_entry, value %></p>
Chris@1296 19 <% end %>
Chris@1296 20 <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
Chris@1296 21 </div>
Chris@1296 22
Chris@1296 23 <%= javascript_tag "observeAutocompleteField('time_entry_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))}')" %>