[Bps-public-commit] RT-BugTracker-Public branch, master, updated. 7070df4720d809c5a5cc3aa2ee16fff641aebdbe

[Thomas Sibley]

The branch, master has been updated
       via  7070df4720d809c5a5cc3aa2ee16fff641aebdbe (commit)
       via  8ebf47676aa86fb2d3d728b6ea667493d0ebe805 (commit)
      from  6c66a2e1c8ced8bcccc0bbfb5ddc94b82c85129a (commit)

Summary of changes:
 html/Public/Search/Simple.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 8ebf47676aa86fb2d3d728b6ea667493d0ebe805
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Jul 9 15:54:31 2012 -0700

    Pass args into results component so paging works

diff --git a/html/Public/Search/Simple.html b/html/Public/Search/Simple.html
index 51e1e5b..51673cd 100644
--- a/html/Public/Search/Simple.html
+++ b/html/Public/Search/Simple.html
@@ -51,7 +51,7 @@
     Title => $title
 &>
 
-% if (not $q) {
+% if (not $q and not $ARGS{Query}) {
 <div id="SimpleSearchForm">
 <form action="Simple.html" method="get">
 
@@ -67,7 +67,7 @@ RT will look for anything else you enter in ticket bodies and attachments.</&></
 </div>
 % }
 % else {
-<& /Public/Search/Elements/Results, Query => $search->QueryToSQL() &>
+<& /Public/Search/Elements/Results, Query => ($search ? $search->QueryToSQL() : undef), %ARGS &>
 % }
 
 <%INIT>

commit 7070df4720d809c5a5cc3aa2ee16fff641aebdbe
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Jul 9 16:16:47 2012 -0700

    Specify a default format, otherwise a blank format is used

diff --git a/html/Public/Search/Simple.html b/html/Public/Search/Simple.html
index 51673cd..ce925c0 100644
--- a/html/Public/Search/Simple.html
+++ b/html/Public/Search/Simple.html
@@ -67,7 +67,7 @@ RT will look for anything else you enter in ticket bodies and attachments.</&></
 </div>
 % }
 % else {
-<& /Public/Search/Elements/Results, Query => ($search ? $search->QueryToSQL() : undef), %ARGS &>
+<& /Public/Search/Elements/Results, Query => ($search ? $search->QueryToSQL() : undef), Format => RT->Config->Get('DefaultSearchResultFormat'), %ARGS &>
 % }
 
 <%INIT>

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