Changeset 29600


Ignore:
Timestamp:
09/17/14 20:33:52 (5 years ago)
Author:
rvelices
Message:
  • active search filter but empty string in batch manager does not change the results
  • if the quick search engine drops a searched term, indicate it in the admin batch manager
Location:
trunk/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/batch_manager.php

    r29598 r29600  
    508508} 
    509509 
    510 if (isset($_SESSION['bulk_manager_filter']['search'])) 
     510if (isset($_SESSION['bulk_manager_filter']['search']) &&  
     511        strlen($_SESSION['bulk_manager_filter']['search']['q'])) 
    511512{ 
    512513  include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' ); 
    513514  $res = get_quick_search_results_no_cache($_SESSION['bulk_manager_filter']['search']['q'], array('permissions'=>false)); 
     515        if (!empty($res['items']) && !empty($res['qs']['unmatched_terms'])) 
     516        { 
     517                $template->assign('no_search_results', $res['qs']['unmatched_terms']); 
     518        } 
    514519  $filter_sets[] = $res['items']; 
    515520} 
  • trunk/admin/themes/default/template/batch_manager_global.tpl

    r29389 r29600  
    418418                                {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} 
    419419                                <a href="admin/popuphelp.php?page=quick_search" onclick="popuphelp(this.href);return false;" title="{'Help'|@translate}"><span class="icon-help-circled"></span></a> 
     420{if (isset($no_search_results))} 
     421<div>{'No results for'|@translate} : 
     422        <em><strong> 
     423        {foreach $no_search_results as $res} 
     424        {if !$res@first} &mdash; {/if} 
     425        {$res} 
     426        {/foreach} 
     427        </strong></em> 
     428</div> 
     429{/if} 
    420430                        </li> 
    421431 
Note: See TracChangeset for help on using the changeset viewer.