diff options
| author | rvelices <rv-github@modusoptimus.com> | 2014-09-17 18:33:52 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2014-09-17 18:33:52 +0000 |
| commit | 0719b52874063cc4e757ddc33e0034253121759c (patch) | |
| tree | 97f134a4b7578a8f39c422b1c9509dbf7b245eb8 /admin | |
| parent | dd486deacdc35ef587d1c49635a5e563c1e5a30d (diff) | |
- 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
git-svn-id: http://piwigo.org/svn/trunk@29600 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/batch_manager.php | 7 | ||||
| -rw-r--r-- | admin/themes/default/template/batch_manager_global.tpl | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 905035fac..47a40f813 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -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']; } diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 648253277..dd218cda0 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -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} — {/if} + {$res} + {/foreach} + </strong></em> +</div> +{/if} </li> <li id="filter_filesize" {if !isset($filter.filesize)}style="display:none"{/if}> |