[Rt-commit] rt branch, 4.4/asset-relationships, created. rt-4.4.0rc2-6-g9137915

[Shawn Moore]

The branch, 4.4/asset-relationships has been created
        at  9137915d7454a2d2046fa35431277900eb5e2f18 (commit)

- Log -----------------------------------------------------------------
commit 4a74e2249c0cce1c8b66fdd78a0828540660ce5a
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Dec 18 19:51:26 2015 +0000

    Improve rendering of "create [rel] ticket in [queue]"
    
        - Having two table elements kind of defeats the purpose of using a table
        - The callback is for "adding more rows" of things that are like links,
          yet it was showing up after "create ticket in"
        - Similarly the custom field groupings for links should show up above
          "create ticket in"

diff --git a/share/html/Elements/ShowLinks b/share/html/Elements/ShowLinks
index 75dc170..f1150fa 100644
--- a/share/html/Elements/ShowLinks
+++ b/share/html/Elements/ShowLinks
@@ -60,10 +60,13 @@
     </td>
   </tr>
 % } }
-</table>
-<table>
+
+% # Allow people to add more rows to the table
+% $m->callback( %ARGS );
+  <& /Elements/ShowCustomFields, Object => $Object, Grouping => 'Links', Table => 0 &>
+
   <tr>
-    <td>
+    <td colspan=2>
       <form action="<% RT->Config->Get('WebPath') ."/Helpers/SpawnLinkedTicket" %>" name="SpawnLinkedTicket">
         <input type="hidden" name="CloneTicket" value="<% $Object->id %>">
         <input type="submit" value="<&|/l&>Create</&>" name="SpawnLinkedTicket">
@@ -80,9 +83,6 @@
       </form>
     </td>
   </tr>
-% # Allow people to add more rows to the table
-% $m->callback( %ARGS );
-  <& /Elements/ShowCustomFields, Object => $Object, Grouping => 'Links', Table => 0 &>
 </table>
 <%INIT>
 my @display = qw(DependsOn DependedOnBy MemberOf Members RefersTo ReferredToBy);

commit 9137915d7454a2d2046fa35431277900eb5e2f18
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Dec 18 19:52:31 2015 +0000

    Show "create linked ticket in" only for tickets
    
        It was showing up on the Assets links display but the form doesn't handle
        Assets yet.
    
        Fixes: I#31558

diff --git a/share/html/Elements/ShowLinks b/share/html/Elements/ShowLinks
index f1150fa..ce12d9c 100644
--- a/share/html/Elements/ShowLinks
+++ b/share/html/Elements/ShowLinks
@@ -65,6 +65,7 @@
 % $m->callback( %ARGS );
   <& /Elements/ShowCustomFields, Object => $Object, Grouping => 'Links', Table => 0 &>
 
+% if ($Object->isa('RT::Ticket')) {
   <tr>
     <td colspan=2>
       <form action="<% RT->Config->Get('WebPath') ."/Helpers/SpawnLinkedTicket" %>" name="SpawnLinkedTicket">
@@ -83,6 +84,7 @@
       </form>
     </td>
   </tr>
+% }
 </table>
 <%INIT>
 my @display = qw(DependsOn DependedOnBy MemberOf Members RefersTo ReferredToBy);

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