From c3e89fbabe6bf30643e155c635b242677eebaf69 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Mon, 29 Apr 2024 19:10:56 +0000 Subject: [PATCH] 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 --- app/models/issue_query.rb | 3 +++ app/views/journals/edit.js.erb | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index bede78575..07b83a303 100644 --- 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 96cf6b4f8..73631840f 100644 --- 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); + } +})(); -- 2.39.5