[Bps-public-commit] rt-extension-quickreply branch, master, updated. fe0566d5cd18704b6f2ec447f1c43850802434f3

[? sunnavy]

The branch, master has been updated
       via  fe0566d5cd18704b6f2ec447f1c43850802434f3 (commit)
       via  f0fa677a89f1cbc496fe13a5e432c1b619f64f4d (commit)
       via  62f6ead87ab6991b695d35aae9fd43c8e37a1600 (commit)
      from  8e88086f305b1ee99741219537c35c1d1bf46c2d (commit)

Summary of changes:
 etc/search_results.diff                                   | 15 ++++++++++++---
 .../Callbacks/QuickReply/Search/Results.html/AfterResults |  2 +-
 .../QuickReply/Search/Results.html/BeforeResults          |  6 ++++--
 .../Display.html/{BeforeShowHistory => AfterShowHistory}  |  0
 4 files changed, 17 insertions(+), 6 deletions(-)
 rename html/Callbacks/QuickReply/Ticket/Display.html/{BeforeShowHistory => AfterShowHistory} (100%)

- Log -----------------------------------------------------------------
commit 62f6ead87ab6991b695d35aae9fd43c8e37a1600
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Sep 20 19:21:42 2013 +0800

    forgot to add WebPath

diff --git a/html/Callbacks/QuickReply/Search/Results.html/AfterResults b/html/Callbacks/QuickReply/Search/Results.html/AfterResults
index 0c62a85..8c6ff0b 100644
--- a/html/Callbacks/QuickReply/Search/Results.html/AfterResults
+++ b/html/Callbacks/QuickReply/Search/Results.html/AfterResults
@@ -4,7 +4,7 @@
 jQuery(function() {
     jQuery('a.quick-reply').click( function() {
         var ticket_id = jQuery(this).attr('ticket-id');
-        jQuery('#quick-reply-container').load('/Ticket/QuickReply.html?id=' + ticket_id,
+        jQuery('#quick-reply-container').load('<% RT->Config->Get('WebPath') %>/Ticket/QuickReply.html?id=' + ticket_id,
             function() {
 % if ( RT->Config->Get('MessageBoxRichText',  $session{'CurrentUser'})) {
                 ReplaceAllTextareas(0);

commit f0fa677a89f1cbc496fe13a5e432c1b619f64f4d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Sep 20 19:36:33 2013 +0800

    put QuickReply below history by default

diff --git a/html/Callbacks/QuickReply/Ticket/Display.html/BeforeShowHistory b/html/Callbacks/QuickReply/Ticket/Display.html/AfterShowHistory
similarity index 100%
rename from html/Callbacks/QuickReply/Ticket/Display.html/BeforeShowHistory
rename to html/Callbacks/QuickReply/Ticket/Display.html/AfterShowHistory

commit fe0566d5cd18704b6f2ec447f1c43850802434f3
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Sep 20 20:29:20 2013 +0800

    DisplayFormat is more appropriate here

diff --git a/etc/search_results.diff b/etc/search_results.diff
index 6e12975..5428425 100644
--- a/etc/search_results.diff
+++ b/etc/search_results.diff
@@ -1,13 +1,22 @@
 diff --git a/share/html/Search/Results.html b/share/html/Search/Results.html
-index d2856e9..4f6cdac 100644
+index d2856e9..b9d819d 100644
 --- a/share/html/Search/Results.html
 +++ b/share/html/Search/Results.html
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,8 @@
      LinkRel => \%link_rel &>
  <& /Elements/Tabs &>
  
 -% $m->callback( ARGSRef => \%ARGS, CallbackName => 'BeforeResults' );
-+% $m->callback( ARGSRef => \%ARGS, Format => \$Format, CallbackName => 'BeforeResults' );
++% my $DisplayFormat;
++% $m->callback( ARGSRef => \%ARGS, Format => \$Format, DisplayFormat => \$DisplayFormat, CallbackName => 'BeforeResults' );
  
  % unless ($ok) {
  %    $msg =~ s{ at .*? line .*}{}s;
+@@ -68,6 +69,7 @@
+     Rows => $Rows,
+     Page => $Page,
+     Format => $Format,
++    DisplayFormat => $DisplayFormat, # in case we set it in callbacks
+     Class => 'RT::Tickets',
+     BaseURL => $BaseURL,
+     SavedSearchId => $ARGS{'SavedSearchId'},
diff --git a/html/Callbacks/QuickReply/Search/Results.html/BeforeResults b/html/Callbacks/QuickReply/Search/Results.html/BeforeResults
index ea43bde..1fe06ec 100644
--- a/html/Callbacks/QuickReply/Search/Results.html/BeforeResults
+++ b/html/Callbacks/QuickReply/Search/Results.html/BeforeResults
@@ -1,10 +1,12 @@
 <%INIT>
-if ( ref $Format ) {
-    $$Format .= q{,'__QuickReply__'} unless $$Format =~ /__QuickReply__/;
+if ( ref $Format && $$Format !~ /__QuickReply__/ ) {
+    $$DisplayFormat = $$Format;
+    $$DisplayFormat .= q{,'__QuickReply__'};
 }
 </%INIT>
 
 <%ARGS>
 $ARGSRef
 $Format => undef
+$DisplayFormat => undef
 </%ARGS>

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