[Bps-public-commit] rt-extension-quickdelete branch, master, updated. 0.04-6-gd0bb8c0

[Kevin Falcone]

The branch, master has been updated
       via  d0bb8c0ea7d16eeec093905fbeaffee87a3066cd (commit)
       via  394eb1ea9b44c966c036e9c5438663c82f7c1932 (commit)
      from  4c5b6f8cd0b4dcc2048b1ab510a680445ff0c21b (commit)

Summary of changes:
 .../Elements/RT__Ticket/ColumnMap/ColumnMap        |    2 +-
 html/RT-Extension-QuickDelete/Toggle               |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 394eb1ea9b44c966c036e9c5438663c82f7c1932
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Aug 9 12:53:02 2011 -0400

    pass html back to ColumnMap rather than printing
    
    ColumnMap wants to close a td and without this, you get "Delete >" in
    your search display.  This also walks around HTML escaping.
    
    Instead, pass back a reference and explicitly walk around the escaping.

diff --git a/html/Callbacks/RT-Extension-QuickDelete/Elements/RT__Ticket/ColumnMap/ColumnMap b/html/Callbacks/RT-Extension-QuickDelete/Elements/RT__Ticket/ColumnMap/ColumnMap
index 5d47354..538838a 100644
--- a/html/Callbacks/RT-Extension-QuickDelete/Elements/RT__Ticket/ColumnMap/ColumnMap
+++ b/html/Callbacks/RT-Extension-QuickDelete/Elements/RT__Ticket/ColumnMap/ColumnMap
@@ -7,7 +7,7 @@ $COLUMN_MAP->{'QuickDelete'} = {
     value => sub {
         my $ticket = shift;
         return unless $ticket->CurrentUserHasRight('DeleteTicket');
-        return $m->comp( '/RT-Extension-QuickDelete/Toggle',
+        return \$m->scomp( '/RT-Extension-QuickDelete/Toggle',
             id => $ticket->id );
         }
 };

commit d0bb8c0ea7d16eeec093905fbeaffee87a3066cd
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Aug 9 12:55:13 2011 -0400

    Return this on one line to work around ColumnMap display issues
    
    ColumnMap helpfully turns any newlines into <br>s which causes it to
    format poorly

diff --git a/html/RT-Extension-QuickDelete/Toggle b/html/RT-Extension-QuickDelete/Toggle
index 1072374..8954bd9 100644
--- a/html/RT-Extension-QuickDelete/Toggle
+++ b/html/RT-Extension-QuickDelete/Toggle
@@ -12,13 +12,13 @@ $ticket->SetStatus('deleted');
 $id
 $toggle => 0
 </%args>
-<span id="quickdelete-toggle-<%$id%>">
+<span id="quickdelete-toggle-<%$id%>">\
 % my $url = $RT::WebPath."/RT-Extension-QuickDelete/ToggleQuickDelete?id=".$id;
-<a align="right" href="<%$url|n%>" onClick="ahah('<%$url|n%>', 'quickdelete-toggle-<%$id|n%>'); return false;" >
+<a align="right" href="<%$url|n%>" onClick="ahah('<%$url|n%>', 'quickdelete-toggle-<%$id|n%>'); return false;" >\
 % if ($ticket->Status ne 'deleted') {
-Delete
+Delete\
 % } else { 
-Undelete
+Undelete\
 % }
-</a>
-</span>
+</a>\
+</span>\

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