summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2024-04-29 19:14:01 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2024-04-29 19:14:01 +0000
commit4a7e5aff286c1b0f482130a28a229713c4746be4 (patch)
tree2ec8d8819c0770cc25ea85d80d475103f3bba515 /app
parentc3e89fbabe6bf30643e155c635b242677eebaf69 (diff)
downloadredmine-4a7e5aff286c1b0f482130a28a229713c4746be4.tar.gz
redmine-4a7e5aff286c1b0f482130a28a229713c4746be4.zip
Reverts r22794 (#40556).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22795 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/issue_query.rb3
-rw-r--r--app/views/journals/edit.js.erb10
2 files changed, 0 insertions, 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);
- }
-})();