roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1603212 - /roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
Date Tue, 17 Jun 2014 16:14:33 GMT
Author: ghuber
Date: Tue Jun 17 16:14:33 2014
New Revision: 1603212

URL: http://svn.apache.org/r1603212
Log:
Additional fix for ROL-1789.

Modified:
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1603212&r1=1603211&r2=1603212&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Tue Jun 17 16:14:33 2014
@@ -804,7 +804,7 @@ Show search again form for a weblog.
         <form method="get" action="$url.search" style="margin: 5px">
           <input type="text" id="q" name="q" class="text medium" maxlength="255" value="$model.term"
style="padding-left: 1px" /><br />
           #set( $cats = $model.weblog.getWeblogCategories())
-          #if(!$site && !$cats.empty)
+          #if(!$site && $model.hits > 0 && !$cats.empty)
             <select name="cat" class="select">
               <option value="">$text.get( "macro.searchresults.incategory" )</option>
               #foreach( $cat in $cats )
@@ -827,7 +827,7 @@ Show search again form for a weblog.
         <form method="get" action="$url.search" style="margin: 5px">
           <input type="search" id="q" name="q" placeholder="Search..." maxlength="255"
value="$model.term" />
           #set( $cats = $model.weblog.getWeblogCategories())
-          #if(!$site && !$cats.empty)
+          #if(!$site && $model.hits > 0 && !$cats.empty)
             <select name="cat" class="select">
               <option value="">$text.get( "macro.searchresults.incategory" )</option>
               #foreach( $cat in $cats )



Mime
View raw message