diff --git a/db/mariadb.sql b/db/mariadb.sql index 745bc2a..88b3acf 100644 --- a/db/mariadb.sql +++ b/db/mariadb.sql @@ -349,7 +349,7 @@ CREATE TABLE provisions ( provname varchar(40) NOT NULL, provcat tinyint(3) DEFAULT NULL, sid smallint(6) UNSIGNED DEFAULT NULL, - boxid smallint(6) UNSIGNED NOT NULL DEFAULT 1, + boxid smallint(6) UNSIGNED DEFAULT NULL, number smallint(6) UNSIGNED NOT NULL DEFAULT 1, target smallint(6) UNSIGNED DEFAULT NULL, -- for shopping list weight float(5,2) UNSIGNED DEFAULT NULL, diff --git a/webgui/cable.php b/webgui/cable.php index 9354e28..813f2a2 100644 --- a/webgui/cable.php +++ b/webgui/cable.php @@ -95,7 +95,17 @@ if ($action == ACT_DEFAULT): // ========== VARIANT: default behavior ======================================= // load filter from db -$flt = db_get_filter($user->id, 211); +$flt = db_get_filter($user->id, 211, ['txt']); + +$w = array('vid=:vid'); +$p = array(':vid' => $user->vid); + +if (strlen($flt->txt) > 1) { + $w[] = 'cablename LIKE :txt OR remarks LIKE :txt'; + $p[':txt'] = '%'.$flt->txt.'%'; +} +$where = join(' AND ', $w); +$order = ' ORDER BY cablename'; echo "