annotate .svn/pristine/22/22629c3ce001e5a68327c24a4b23675476508e16.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 261b3d9a4903
children
rev   line source
Chris@1464 1 <%= error_messages_for 'time_entry' %>
Chris@1464 2 <%= back_url_hidden_field_tag %>
Chris@1464 3
Chris@1464 4 <div class="box tabular">
Chris@1464 5 <% if @time_entry.new_record? %>
Chris@1464 6 <% if params[:project_id] || @time_entry.issue %>
Chris@1464 7 <%= f.hidden_field :project_id %>
Chris@1464 8 <% else %>
Chris@1464 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@1464 10 <% end %>
Chris@1464 11 <% end %>
Chris@1464 12 <p>
Chris@1464 13 <%= f.text_field :issue_id, :size => 6 %>
Chris@1464 14 <span id="time_entry_issue"><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></span>
Chris@1464 15 </p>
Chris@1464 16 <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
Chris@1464 17 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
Chris@1464 18 <p><%= f.text_field :comments, :size => 100, :maxlength => 255 %></p>
Chris@1464 19 <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
Chris@1464 20 <% @time_entry.custom_field_values.each do |value| %>
Chris@1464 21 <p><%= custom_field_tag_with_label :time_entry, value %></p>
Chris@1464 22 <% end %>
Chris@1464 23 <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
Chris@1464 24 </div>
Chris@1464 25
Chris@1464 26 <%= javascript_tag do %>
Chris@1464 27 observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {
Chris@1464 28 select: function(event, ui) {
Chris@1464 29 $('#time_entry_issue').text(ui.item.label);
Chris@1464 30 }
Chris@1464 31 });
Chris@1464 32 <% end %>