From ad1e0403b18cc3cc7ecf071191e00909d7250564 Mon Sep 17 00:00:00 2001
From: Akihiro MATOBA <matobaa+github@gmail.com>
Date: Sat, 19 Jun 2021 06:13:49 +0000
Subject: [PATCH 1/2] apply 0001b at
 https://www.redmine.org/issues/3143#note-35

---
 app/views/issues/_action_menu.html.erb      |  3 +++
 app/views/issues/_action_menu_edit.html.erb |  2 +-
 app/views/issues/_edit.html.erb             |  2 +-
 config/locales/en.yml                       |  1 +
 public/javascripts/application.js           | 14 ++++++++++++++
 public/stylesheets/application.css          |  2 +-
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index 1904f21711..d37fd889ab 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -1,4 +1,7 @@
 <div class="contextual">
+<%= link_to l(:button_add_notes), edit_issue_path(@issue),
+            :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;',
             :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
diff --git a/app/views/issues/_action_menu_edit.html.erb b/app/views/issues/_action_menu_edit.html.erb
index a189d7c453..322726c37a 100644
--- a/app/views/issues/_action_menu_edit.html.erb
+++ b/app/views/issues/_action_menu_edit.html.erb
@@ -3,7 +3,7 @@
 
 <div style="clear: both;"></div>
 <% if @issue.editable? %>
-  <div id="update" style="display:none;">
+  <div id="update" class="hidden">
     <h3><%= l(:button_edit) %></h3>
     <%= render :partial => 'edit' %>
   </div>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index d816ff6fc5..a402f89e2c 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -3,7 +3,7 @@
     <%= render :partial => 'conflict' if @conflict %>
     <div class="box">
     <% if @issue.attributes_editable? %>
-        <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
+        <fieldset id="attributes" class="tabular"><legend><%= l(:label_change_properties) %></legend>
         <div id="all_attributes">
         <%= render :partial => 'form', :locals => {:f => f} %>
         </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f9064c866e..fb36f6cb1e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1152,6 +1152,7 @@ en:
   button_edit: Edit
   button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
   button_add: Add
+  button_add_notes: Add notes
   button_change: Change
   button_apply: Apply
   button_clear: Clear
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a183a2777b..cc71f30da5 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -27,6 +27,20 @@ function showAndScrollTo(id, focus) {
   $('html, body').animate({scrollTop: $('#'+id).offset().top}, 100);
 }
 
+function showAndScrollToEditIssue() {
+  $('#update h3').show();
+  $('#attributes').show();
+  $('#log_time').show();
+  showAndScrollTo('update', 'issue_notes');
+}
+
+function showAndScrollToAddNotes() {
+  $('#update h3').hide();
+  $('#attributes').hide();
+  $('#log_time').hide();
+  showAndScrollTo('update', 'issue_notes');
+}
+
 function toggleRowGroup(el) {
   var tr = $(el).parents('tr').first();
   var n = tr.next();
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7d256832bc..3bc2f08737 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -141,7 +141,7 @@ div.modal p.buttons {margin-bottom:0;}
 div.modal .box p {margin: 0.3em 0;}
 
 .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-
+.hidden {display: none;}
 .mobile-show {display: none;}
 .hidden {display: none;}
 .inline-flex {display: inline-flex;}

From cbc4fb556febd684f247d6cb257034231f74dbe8 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 2/2] =?UTF-8?q?#48=20=E7=AC=AC12=E5=9B=9E=E3=83=91?=
 =?UTF-8?q?=E3=83=83=E3=83=81=E4=BC=9A=E3=81=A7=E3=81=AE=E4=BC=9A=E8=A9=B1?=
 =?UTF-8?q?=E3=82=92=E5=8F=97=E3=81=91=E3=81=A6=20https://scrapbox.io/redm?=
 =?UTF-8?q?ine-patch/%E7%AC%AC12%E5%9B%9E-%E3%82%B3%E3%83%A1%E3%83%B3%E3%8?=
 =?UTF-8?q?3%88%E3%81%AF%E7%B7%A8%E9%9B%86%E3%83%AA%E3%83%B3%E3%82%AF%E3%8?=
 =?UTF-8?q?1%8B%E3%82%89%E3%81%A7%E3%81%AF%E3%81%AA%E3%81%8F%E3%80%81%E3%8?=
 =?UTF-8?q?2%B3%E3%83%A1%E3%83%B3%E3%83%88%E8%BF%BD%E5%8A%A0%E7%94%A8%E3%8?=
 =?UTF-8?q?1%AEUI%E3%81%AB%E3%81%AA%E3%81%A3%E3%81%A6%E3%81%BB%E3%81%97%E3?=
 =?UTF-8?q?%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 d37fd889ab..b9712bd030 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 a402f89e2c..4c3cb5b45d 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 cc71f30da5..c60c09af42 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');
 }