|
@@ -22,7 +22,20 @@ if($id) $nvp["id"] = $id;
|
|
|
if($internal_id) $nvp["internal_id"] = db::escape($internal_id);
|
|
if($internal_id) $nvp["internal_id"] = db::escape($internal_id);
|
|
|
if($name) $nvp["name"] = (new Constraint("CONTAINS"))->setValues(db::escape($name));
|
|
if($name) $nvp["name"] = (new Constraint("CONTAINS"))->setValues(db::escape($name));
|
|
|
|
|
|
|
|
-$locations = Location::query($nvp, ["sort" => "name", "order" => "asc"]);
|
|
|
|
|
|
|
+$sort = http::value("sort");
|
|
|
|
|
+switch($sort) {
|
|
|
|
|
+ case "last_added":
|
|
|
|
|
+ $query_sort = "id";
|
|
|
|
|
+ $order = "desc";
|
|
|
|
|
+ break;
|
|
|
|
|
+ default:
|
|
|
|
|
+ $query_sort = "name";
|
|
|
|
|
+ $order = "asc";
|
|
|
|
|
+ break;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+$locations = Location::query($nvp, ["sort" => $query_sort, "order" => $order]);
|
|
|
|
|
|
|
|
$filter_count = count($nvp) - 1;
|
|
$filter_count = count($nvp) - 1;
|
|
|
|
|
|