Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-27 09:49:57 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22794 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2024-04-29 19:10:56 +00:00
parent 383d9ae6c7
commit c3e89fbabe
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/issue_query.rb
View File

@@ -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')

10
app/views/journals/edit.js.erb
View File

@@ -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);
}
})();