archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- active search filter but empty string in batch manager does not change the results

Browse source 
- if the quick search engine drops a searched term, indicate it in the admin batch manager

git-svn-id: http://piwigo.org/svn/trunk@29600 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2014-09-17 18:33:52 +00:00
parent dd486deacd
commit 0719b52874
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
admin/batch_manager.php
View file

@ -507,10 +507,15 @@ SELECT id
$filter_sets[] = query2array($query, null, 'id');
}
if (isset($_SESSION['bulk_manager_filter']['search']))
if (isset($_SESSION['bulk_manager_filter']['search']) &&
strlen($_SESSION['bulk_manager_filter']['search']['q']))
{
include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' );
$res = get_quick_search_results_no_cache($_SESSION['bulk_manager_filter']['search']['q'], array('permissions'=>false));
if (!empty($res['items']) && !empty($res['qs']['unmatched_terms']))
{
$template->assign('no_search_results', $res['qs']['unmatched_terms']);
}
$filter_sets[] = $res['items'];
}

10
admin/themes/default/template/batch_manager_global.tpl
View file

@ -417,6 +417,16 @@ var sliders = {
<input name="q" size=40 value="{$filter.search.q|stripslashes|htmlspecialchars}">
{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
<a href="admin/popuphelp.php?page=quick_search" onclick="popuphelp(this.href);return false;" title="{'Help'|@translate}"><span class="icon-help-circled"></span></a>
{if (isset($no_search_results))}
<div>{'No results for'|@translate} :
<em><strong>
{foreach $no_search_results as $res}
{if !$res@first} &mdash; {/if}
{$res}
{/foreach}
</strong></em>
</div>
{/if}
</li>
<li id="filter_filesize" {if !isset($filter.filesize)}style="display:none"{/if}>