annotate .svn/pristine/57/57f5137195b9f3676e6181b2962bab9a4eb72e00.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 <%= error_messages_for 'time_entry' %>
Chris@1295 2 <%= back_url_hidden_field_tag %>
Chris@1295 3
Chris@1295 4 <div class="box tabular">
Chris@1295 5 <% if @time_entry.new_record? %>
Chris@1295 6 <% if params[:project_id] || @time_entry.issue %>
Chris@1295 7 <%= f.hidden_field :project_id %>
Chris@1295 8 <% else %>
Chris@1295 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@1295 10 <% end %>
Chris@1295 11 <% end %>
Chris@1295 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@1295 13 <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
Chris@1295 14 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
Chris@1295 15 <p><%= f.text_field :comments, :size => 100, :maxlength => 255 %></p>
Chris@1295 16 <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
Chris@1295 17 <% @time_entry.custom_field_values.each do |value| %>
Chris@1295 18 <p><%= custom_field_tag_with_label :time_entry, value %></p>
Chris@1295 19 <% end %>
Chris@1295 20 <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
Chris@1295 21 </div>
Chris@1295 22
Chris@1295 23 <%= javascript_tag "observeAutocompleteField('time_entry_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))}')" %>