[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.1-456-g528864752d

[? sunnavy]

The branch, 5.0-trunk has been updated
       via  528864752d910b388eb58acc7aa49a3b53e39fe9 (commit)
       via  655ad05bc5da585c44810cf1e56b280dfda6158a (commit)
       via  c572855e1103ca404e65cb95a1f5cb1cac9bbe95 (commit)
      from  da85b79c2b9f3cba5a49a41ae2467e7730ccc49f (commit)

Summary of changes:
 share/html/Asset/Elements/ShowBasics      | 16 ++++++++--------
 share/html/Ticket/Elements/ShowAssets     |  1 +
 share/static/css/elevator-light/forms.css |  6 ++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit c572855e1103ca404e65cb95a1f5cb1cac9bbe95
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jun 10 08:08:11 2021 +0800

    Move asset field-specific css classes up to the row instead of just label
    
    It was wrongly ported when migrating to rt 5 themes.

diff --git a/share/html/Asset/Elements/ShowBasics b/share/html/Asset/Elements/ShowBasics
index 5ab599bc5a..394558a83c 100644
--- a/share/html/Asset/Elements/ShowBasics
+++ b/share/html/Asset/Elements/ShowBasics
@@ -45,8 +45,8 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<div class="form-row">
-  <div class="label col-3 asset-catalog">
+<div class="form-row asset-catalog">
+  <div class="label col-3">
     <&|/l&>Catalog</&>:
   </div>
   <div class="value col-9">
@@ -54,8 +54,8 @@
   </div>
 </div>
 
-<div class="form-row">
-  <div class="col-3 asset-name label">
+<div class="form-row asset-name">
+  <div class="col-3 label">
     <&|/l&>Name</&>:
   </div>
   <div class="value col-9">
@@ -63,8 +63,8 @@
   </div>
 </div>
 
-<div class="form-row">
-  <div class="col-3 asset-description label">
+<div class="form-row asset-description">
+  <div class="col-3 label">
     <&|/l&>Description</&>:
   </div>
   <div class="value col-9">
@@ -72,8 +72,8 @@
   </div>
 </div>
 
-<div class="form-row">
-  <div class="col-3 asset-status label">
+<div class="form-row asset-status">
+  <div class="col-3 label">
     <&|/l&>Status</&>:
   </div>
   <div class="value col-9">

commit 655ad05bc5da585c44810cf1e56b280dfda6158a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Jun 11 03:23:36 2021 +0800

    Align label/value columns for Assets widget in ticket display
    
    This is to mirror what ".current-value.form-control" looks like. The
    reason we don't add "form-control" here is "ShowAssets" calls another
    component "ShowRecord" to render the html, which doesn't know if it's in
    a form or not(unless we pass a new argument). Adding a new css rule is
    more straightforward.

diff --git a/share/static/css/elevator-light/forms.css b/share/static/css/elevator-light/forms.css
index 0a40072db9..e43743cbb3 100644
--- a/share/static/css/elevator-light/forms.css
+++ b/share/static/css/elevator-light/forms.css
@@ -310,6 +310,12 @@ span.current-value.form-control {
   height: auto;
 }
 
+/* Assets widget in ticket display */
+form span.current-value {
+  display: block;
+  padding-top: 5px;
+}
+
 .list-group-item label {
   margin-bottom: 0;
 }

commit 528864752d910b388eb58acc7aa49a3b53e39fe9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Jun 11 03:34:45 2021 +0800

    Disable inline edit for related tickets in "Assets" widget of ticket display
    
    We don't need inline edit here, not mentioning that it breaks html
    because of nested forms.

diff --git a/share/html/Ticket/Elements/ShowAssets b/share/html/Ticket/Elements/ShowAssets
index a83649ea0b..953e04844d 100644
--- a/share/html/Ticket/Elements/ShowAssets
+++ b/share/html/Ticket/Elements/ShowAssets
@@ -196,6 +196,7 @@ if ($ShowRelatedTickets) {
                 ShowHeader        => 0,
                 AllowSorting      => 0,
                 ShowNavigation    => 0,
+                InlineEdit        => 0,
             &>
           </div>
         </div>

-----------------------------------------------------------------------