[Rt-commit] rt branch, 4.4/txn-text-cf-ui, repushed
? sunnavy
sunnavy at bestpractical.com
Fri Mar 13 18:43:27 EDT 2020
The branch 4.4/txn-text-cf-ui was deleted and repushed:
was 65759041489c271c1024860a0676a2e3a805ece7
now 92209a4d34bb0715ad02b5d9d5770590f914507f
1: 657590414 ! 1: 98858ac65 Friendly transaction UI of text CF changes especially for large contents
@@ -41,6 +41,9 @@
+ if ( !defined($old) || $old eq '' ) {
+ return ("[_1] added", $field); #loc()
+ }
++ if ( !defined($new) || $new eq '' ) {
++ return ("[_1] deleted", $field); #loc()
++ }
+ else {
+ return ("[_1] changed", $field); #loc()
+ }
@@ -71,14 +74,19 @@
</%PERL>
+
+% if ( $old || $new ) {
-+ <div class="details <% $ShowActions ? 'hidden' : '' %>" id="txn-<% $Transaction->Id %>-details">
++ <div class="details hidden %>" id="txn-<% $Transaction->Id %>-details">
+ <table>
-+% if ( $old eq loc('(no value)') ) {
++% if ( $old eq loc('(no value)') ) {
+ <tr>
+ <td class="value"><% $new |n %></td>
+ </tr>
-+% }
-+% else {
++% }
++% elsif ( $new eq loc('(no value)') ) {
++ <tr>
++ <td class="value"><% $old |n %></td>
++ </tr>
++% }
++% else {
+ <tr>
+ <td class="label"><% loc('From') %>:</td>
+ <td class="value" ><% $old |n %></td>
@@ -87,7 +95,7 @@
+ <td class="label"><% loc('To') %>:</td>
+ <td class="value"><% $new |n %></td>
+ </tr>
-+% }
++% }
+ </table>
+ </div>
+% }
@@ -112,16 +120,16 @@
+ $new = $m->comp('/Elements/ScrubHTML', Content => $new);
+ $new =~ s|\n|<br />|g;
+
-+ if ($ShowActions) {
-+ my $id = $Transaction->Id;
-+ push @actions,
-+ {
-+ class => "toggle-txn-details",
-+ title => loc('Show Details'),
-+ onclick => "return toggleTransactionDetails('txn-$id-details', this)",
-+ path => '#',
-+ };
-+ }
++ my $id = $Transaction->Id;
++
++ # Ignore $ShowActions as it's a page helper, not a real action.
++ push @actions,
++ {
++ class => "toggle-txn-details",
++ title => loc('Show Details'),
++ onclick => "return toggleTransactionDetails('txn-$id-details', this)",
++ path => '#',
++ };
+ }
+}
+
@@ -200,3 +208,4 @@
+
+ return false;
+}
+
-: ------- > 2: 9dd112ca0 Highlight changes of text CF contents in transaction UI
-: ------- > 3: 92209a4d3 Test the new transaction UI of text CF changes
More information about the rt-commit
mailing list