hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 21:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-752 #time 4h

Browse Source 
fix : tf-* (phraseanet) admin / field / source does not says "invalid"
add : better completion for field source : now can type things like "phr:tim" to match namespace(s) and tagname(s)
This commit is contained in:
Jean-Yves Gaulier
2015-10-13 17:23:52 +02:00
parent cb98ac8216
commit bb67a1a4bc
3 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php
View File

@@ -119,26 +119,40 @@ class FieldsController extends Controller
public function searchTag(Request $request)
{
$term = trim(strtolower($request->query->get('term')));
$term = str_replace(['/', ':', '.'], ' ', strtolower($request->query->get('term')));
$res = [];
if ($term) {
$term = explode(' ', $term, 2);
if(($term[0] = trim($term[0])) != '') {
if( ($nparts = count($term)) == 2) {
$term[1] = trim($term[1]);
}
$provider = new TagProvider();
foreach ($provider->getLookupTable() as $namespace => $tags) {
$ns = strpos($namespace, $term);
$match_ns = (strpos($namespace, $term[0]) !== false);
if($nparts == 2 && !$match_ns) {
// with "abc:xyz", "abc" MUST match the namespace
continue;
}
foreach ($tags as $tagname => $datas) {
if ($ns === false && strpos($tagname, $term) === false) {
continue;
if($nparts == 1) {
// "abc" can match the namespace OR the tagname
$match = $match_ns || (strpos($tagname, $term[0]) !== false);
}
else {
// match "abc:xyz" against namespace (already true) AND tagname
$match = ($term[1] == '' || strpos($tagname, $term[1]) !== false);
}
$res[] = [
'id' => $namespace . '/' . $tagname,
/** @Ignore */
'label' => $datas['namespace'] . ' / ' . $datas['tagname'],
'value' => $datas['namespace'] . ':' . $datas['tagname'],
];
if($match) {
$res[] = [
'id' => $namespace . '/' . $tagname,
/** @Ignore */
'label' => $datas['namespace'] . ' / ' . $datas['tagname'],
'value' => $datas['namespace'] . ':' . $datas['tagname'],
];
}
}
}
}