Просмотр исходного кода

Allow location searching via textual internal IDs

Alan Lam 6 лет назад
Родитель
Сommit
fcab322703
3 измененных файлов с 9 добавлено и 3 удалено
  1. 2 2
      controllers/locations.php
  2. 6 0
      engine/constraint.php
  3. 1 1
      views/locations.php

+ 2 - 2
controllers/locations.php

@@ -29,8 +29,8 @@ $name = http::value("name", "trim");
 
 if($id) $nvp["id"] = $id;
 if($ids) $nvp["id"] = $ids;
-if($internal_id) $nvp["internal_id"] = db::escape($internal_id);
-if($name) $nvp["name"] = (new Constraint("CONTAINS"))->setValues(db::escape($name));
+if($internal_id) $nvp["internal_id"] = Constraint::contains($internal_id);
+if($name) $nvp["name"] = Constraint::contains($name);
 
 $sort = http::value("sort");
 switch($sort) {

+ 6 - 0
engine/constraint.php

@@ -24,6 +24,12 @@ class Constraint {
 	private $type;
 	private $values = [];
 
+	public static function contains(string $string): Constraint {
+		$constraint = new Constraint("CONTAINS");
+		$constraint->setValues($string);
+		return $constraint;
+	}
+
 	/**
 	 * Constraint constructor.
 	 * @param string $type

+ 1 - 1
views/locations.php

@@ -83,7 +83,7 @@ var customerId = <?=$customer->id?>;
 						<div class="row mb-1">
 							<label class="col-sm-4 col-form-label" for="internal-id">Internal ID</label>
 							<div class="col-sm">
-								<input class="form-control" type="number" name="internal_id" id="internal-id" placeholder="Enter internal ID" value="<?=htmlspecialchars(http::value("internal_id", "trim"))?>" />
+								<input class="form-control" type="text" name="internal_id" id="internal-id" placeholder="Enter internal ID" value="<?=htmlspecialchars(http::value("internal_id", "trim"))?>" />
 							</div>
 						</div>
 					</div>