From 4a7e5aff286c1b0f482130a28a229713c4746be4 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Mon, 29 Apr 2024 19:14:01 +0000 Subject: [PATCH] Reverts r22794 (#40556). git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22795 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue_query.rb | 3 --- app/views/journals/edit.js.erb | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 07b83a303..bede78575 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -535,9 +535,6 @@ 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 73631840f..96cf6b4f8 100644 --- a/app/views/journals/edit.js.erb +++ b/app/views/journals/edit.js.erb @@ -6,13 +6,3 @@ 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