From 28b44e0a59734306beb0a1d83ce6c5245849a5bf Mon Sep 17 00:00:00 2001
From: Akihiro MATOBA <matobaa+github@gmail.com>
Date: Wed, 21 Jul 2021 00:45:50 +0000
Subject: [PATCH] =?UTF-8?q?#48=20=E7=AC=AC12=E5=9B=9E=E3=83=91=E3=83=83?=
 =?UTF-8?q?=E3=83=81=E4=BC=9A=E3=81=A7=E3=81=AE=E4=BC=9A=E8=A9=B1=E3=82=92?=
 =?UTF-8?q?=E5=8F=97=E3=81=91=E3=81=A6=20https://scrapbox.io/redmine-patch?=
 =?UTF-8?q?/%E7%AC%AC12%E5%9B%9E-%E3%82%B3%E3%83%A1%E3%83%B3%E3%83%88%E3%8?=
 =?UTF-8?q?1%AF%E7%B7%A8%E9%9B%86%E3%83%AA%E3%83%B3%E3%82%AF%E3%81%8B%E3%8?=
 =?UTF-8?q?2%89%E3%81%A7%E3%81%AF%E3%81%AA%E3%81%8F%E3%80%81%E3%82%B3%E3%8?=
 =?UTF-8?q?3%A1%E3%83%B3%E3%83%88%E8%BF%BD%E5%8A%A0%E7%94%A8%E3%81%AEUI%E3?=
 =?UTF-8?q?%81%AB%E3%81%AA%E3%81%A3%E3%81%A6%E3%81%BB%E3%81%97%E3%81%84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_action_menu.html.erb | 2 +-
 app/views/issues/_edit.html.erb        | 2 +-
 public/javascripts/application.js      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index d37fd889a..b9712bd03 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -3,7 +3,7 @@
             :onclick => 'showAndScrollToAddNotes(); return false;',
             :class => 'icon icon-add' if @issue.editable? %>
 <%= link_to l(:button_edit), edit_issue_path(@issue),
-            :onclick => 'showAndScrollTo("update", "issue_notes"); return false;',
+            :onclick => 'showAndScrollToEditIssue("update", "issue_notes"); return false;',
             :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
 <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue),
             :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index a402f89e2..4c3cb5b45 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -75,7 +75,7 @@
     <%= submit_tag l(:button_submit) %>
     <%= link_to(
           l(:button_cancel), issue_path(id: @issue.id),
-          :onclick => params[:action] == 'show' ? "$('#update').hide(); return false;" : ''
+          :onclick => params[:action] == 'show' ? "window.location.reload();" : ''
         ) %>
     <%= hidden_field_tag 'prev_issue_id', @prev_issue_id if @prev_issue_id %>
     <%= hidden_field_tag 'next_issue_id', @next_issue_id if @next_issue_id %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index fd84feefb..d17f94bc5 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -29,15 +29,15 @@ function showAndScrollTo(id, focus) {
 
 function showAndScrollToEditIssue() {
   $('#update h3').show();
-  $('#attributes').show();
-  $('#log_time').show();
+  $('#attributes').show(); $('#attributes input, #attributes select').prop('disabled', false)
+  $('#log_time').show(); $('#log_time input, #log_time select').prop('disabled', false)
   showAndScrollTo('update', 'issue_notes');
 }
 
 function showAndScrollToAddNotes() {
   $('#update h3').hide();
-  $('#attributes').hide();
-  $('#log_time').hide();
+  $('#attributes').hide();$('#attributes input, #attributes select').prop('disabled', true)
+  $('#log_time').hide();$('#log_time input, #log_time select').prop('disabled', true)
   showAndScrollTo('update', 'issue_notes');
 }