Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added more Roles (address types)

Browse Source
This commit is contained in:
Frank Schubert
2021-06-22 21:41:06 +02:00
parent b41a28f1dc
commit 29e894ebd5
7 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/User/UserController.php
View File

@@ -29,11 +29,16 @@ class UserController extends mfBaseController {
}
$this->layout()->setTemplate('User/Index');
$users = UserModel::getAll();
if($this->request->filter) {
$users = UserModel::search($this->request->filter);
} else {
$users = UserModel::getAll();
}
$this->layout()->set('users',$users);
$addresses = AddressModel::getAll();
$this->layout()->set("addresses", $addresses);
$this->layout()->set("filter", $this->request->filter);
}
protected function addAction($request) {

8
application/User/UserModel.php
View File

@@ -67,7 +67,7 @@ class UserModel {
$where = self::getSqlFilter($filter);
$sql = "SELECT Worker.* FROM Worker, WorkerPermission
WHERE WorkerPermission.worker_id= Worker.id
WHERE WorkerPermission.worker_id = Worker.id
AND $where
GROUP BY WorkerPermission.worker_id
ORDER BY Worker.id";
@@ -86,10 +86,8 @@ class UserModel {
//var_dump($filter);exit;
if(array_key_exists("address_id", $filter)) {
$addressid = $filter['address_id'];
if($addressid === null || $addressid == "null") {
$where .= " AND address_id IS NULL";
} elseif(is_numeric($addressid)) {
$where .= " AND parent_id=$addressid";
if($addressid) {
$where .= " AND address_id=$addressid";
}
}
//var_dump($filter, $where);exit;