improve autocomplete for CDC selector

pouetnet · Nov 22, 2013 · 3bc78c5 · 3bc78c5
1 parent e718d04
commit 3bc78c5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/account.php b/account.php
@@ -679,7 +679,13 @@ function updateAvatar()
   for (var i=1; i<10; i++)
   {
     if (!$("cdc"+i)) continue;
-    new Autocompleter($("cdc"+i), {"dataUrl":"./ajax_prods.php"});
+    new Autocompleter($("cdc"+i), {
+      "dataUrl":"./ajax_prods.php",
+      "width":320,
+      "processRow": function(item) {
+        return item.name.escapeHTML() + " <small class='group'>" + item.groupName.escapeHTML() + "</small>";
+      }
+    });
   }
 });
 //-->

diff --git a/ajax_prods.php b/ajax_prods.php
@@ -4,21 +4,23 @@
 header("Content-type: application/json; charset=utf-8");
 
 $sql = new SQLSelect();
-$sql->AddField("id");
-$sql->AddField("name");
+$sql->AddField("prods.id");
+$sql->AddField("prods.name");
+$sql->AddField("groups.name as groupName");
+$sql->AddJoin("left","groups","groups.id = prods.group1");
 $sql->AddTable("prods");
 
 $r = array();
 if ($_POST["search"])
 {
-  $sql->AddWhere(sprintf_esc("name like '%%%s%%'",_like($_POST["search"])));
-  $sql->AddOrder(sprintf_esc("if(name='%s',1,2), views desc, name",$_POST["search"]));
+  $sql->AddWhere(sprintf_esc("prods.name like '%%%s%%'",_like($_POST["search"])));
+  $sql->AddOrder(sprintf_esc("if(prods.name='%s',1,2), prods.views desc, prods.name",$_POST["search"]));
   $sql->SetLimit(10);
   $r = SQLLib::selectRows( $sql->GetQuery() );
 }
 else if ($_POST["id"])
 {
-  $sql->AddWhere(sprintf_esc("id = %d",$_POST["id"]));
+  $sql->AddWhere(sprintf_esc("prods.id = %d",$_POST["id"]));
   $sql->SetLimit(1);
   $r = SQLLib::selectRows( $sql->GetQuery() );
 }

diff --git a/autocompleter.js b/autocompleter.js
@@ -6,6 +6,7 @@ Autocompleter = Class.create({
       keyValue: true,
       dropdown: false,
       lockSelect: true,
+      width: null,
     },options || {}); 
     var instance = this;
 
@@ -204,7 +205,7 @@ Autocompleter = Class.create({
         instance.autoCompleteList.setStyle({
           "top" :(instance.searchBox.cumulativeOffset().top + instance.searchBox.getLayout().get("height") + 4) + "px",
           "left":instance.searchBox.cumulativeOffset().left + "px",
-          "width":instance.searchBox.getLayout().get("width") + "px",
+          "width":(instance.options.width == null ? instance.searchBox.getLayout().get("width") : parseInt(instance.options.width,10)) + "px",
         });
         results.each(function(item){
           var func = instance.options.processRow || function(item) { return item.name.escapeHTML() };