Merged r22791 from trunk to 5.1-stable (#40556).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22794 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index bede78575f7c9a99b980e26ffd55f334faf944ff..07b83a30320ef1f0196156f50fd862194622179e 100644 (file)
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -535,6 +535,9 @@ class IssueQuery < Query
           sql_for_field(field, '=', others, db_table, 'user_id') +
         ')'
       else
+        Rails.logger.debug "****"*50
+        Rails.logger.debug me.inspect
+        exit 1
         "SELECT #{db_table}.watchable_id FROM #{db_table} " +
         "WHERE #{db_table}.watchable_type='Issue' AND " +
         sql_for_field(field, '=', me, db_table, 'user_id')

diff --git a/app/views/journals/edit.js.erb b/app/views/journals/edit.js.erb
index 96cf6b4f80ed5f633a1d36c4f0f4abb61307705d..73631840f4d511dc298d61034c8bc3318aa83a75 100644 (file)
--- a/app/views/journals/edit.js.erb
+++ b/app/views/journals/edit.js.erb
@@ -6,3 +6,13 @@ if ($("form#journal-<%= @journal.id %>-form").length > 0) {
 } else {
   $("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>');
 }
+
+// Focus on the textarea
+(() => {
+  const textarea = $("#journal-<%= @journal.id %>-form .wiki-edit");
+  if (textarea.length > 0) {
+    textarea.focus();
+    const textareaLength = textarea.val().length;
+    textarea.get(0).setSelectionRange(textareaLength, textareaLength);
+  }
+})();