Added more Roles (address types)

application/Address/Address.php

@@ -21,6 +21,13 @@ class Address extends mfBaseModel {
     
   }
   
+  public function getCompanyOrName() {
+    if($this->company) {
+      return $this->company;
+    }
+    return $this->getFullName();
+  }
+  
   private function loadAddresstypes() {
     if(!$this->id) {
       return false;

application/User/UserController.php

@@ -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) {

application/User/UserModel.php

@@ -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;