Issue subject is not updated when you select another issue on time entry form (#24041).

git-svn-id: http://svn.redmine.org/redmine/trunk@15951 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 9 insertions, 9 deletions

diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
index f0c042a56..5b0ec6aac 100644
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -13,9 +13,9 @@
   <% end %>
   <p>
     <%= f.text_field :issue_id, :size => 6 %>
-    <% if @time_entry.issue.try(:visible?) %>
-      <span id="time_entry_issue"><%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %></span>
-    <% end %>
+    <span id="time_entry_issue">
+      <%=  link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>
+    </span>
   </p>
   <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
   <p><%= f.text_field :hours, :size => 6, :required => true %></p>
@@ -28,22 +28,20 @@
 </div>
 
 <%= javascript_tag do %>
-<% if @time_entry.new_record? %>
   $(document).ready(function(){
     $('#time_entry_project_id, #time_entry_issue_id').change(function(){
       $.ajax({
-        url: '<%= escape_javascript new_time_entry_path(:format => 'js') %>',
+        url: '<%= escape_javascript(@time_entry.new_record? ? new_time_entry_path(:format => 'js') : edit_time_entry_path(:format => 'js')) %>',
         type: 'post',
-        data: $('#new_time_entry').serialize()
+        data: $(this).closest('form').serialize()
       });
     });
   });
-<% end %>
 
   observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {
     select: function(event, ui) {
-      $('#time_entry_issue').text(ui.item.label);
-      $('#time_entry_issue_id').blur();
+      $('#time_entry_issue').text('');
+      $('#time_entry_issue_id').val(ui.item.value).change();
     }
   });
 <% end %>
diff --git a/app/views/timelog/edit.js.erb b/app/views/timelog/edit.js.erb
new file mode 100644
index 000000000..cd7861140
--- /dev/null
+++ b/app/views/timelog/edit.js.erb
@@ -0,0 +1 @@
+$('#time_entry_issue').html('<%= escape_javascript link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>');
diff --git a/app/views/timelog/new.js.erb b/app/views/timelog/new.js.erb
index f76cbb84f..4cba8cfe6 100644
--- a/app/views/timelog/new.js.erb
+++ b/app/views/timelog/new.js.erb
@@ -1 +1,2 @@
 $('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>');
+$('#time_entry_issue').html('<%= escape_javascript link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>');