DataObjects/core.sql

[Pman.Core] / DataObjects / Companies.php

diff --git a/DataObjects/Companies.php b/DataObjects/Companies.php
index d193779..386a6da 100644 (file)
--- a/DataObjects/Companies.php
+++ b/DataObjects/Companies.php
@@ -99,6 +99,12 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
                 ) as comptype_display_name
         ");
         
+        if(!empty($q['query']['name'])){
+            $s = $this->escape($q['query']['name']);
+            $this->whereAdd("
+                {$tn}.name LIKE '%$s%'
+            ");
+        }
          
     }
     
@@ -240,10 +246,14 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
         }
     }
     
-    function beforeDelete()
+    function beforeDelete($req, $roo)
     {
         // should check for members....
-        
+        if(!empty($this->is_system) && 
+            ($old->code != $this->code || $old->name != $this->name)
+        ){
+            $roo->jerr('This company is not allow to delete');
+        }
         $img = DB_DataObject::factory('Images');
         $img->ontable = 'Companies';
         $img->onid = $this->id;
@@ -319,7 +329,7 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
         $e = DB_DataObject::Factory('core_enum')->lookupObject('COMPTYPE', $this->comptype);
         
         $ret['comptype_display'] = $ret['comptype'];
-        if ($e->find(true) && !empty($e->name_display)) {
+        if ($e   && !empty($e->name_display)) {
             $ret['comptype_display'] = $e->name_display;
         }
         
@@ -345,7 +355,7 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
             if(!$com->find(true)){
                 $com->created_dt = Date('Y-m-d H:i:s');
                 $com->updated_dt = Date('Y-m-d H:i:s');
-                $com->is_system = 1;
+                $com->is_system = 1;// new column.. block the user changing the code and name..
                 $com->insert();
             }
         }
@@ -393,9 +403,9 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
         $companies->insert();
         $companies->onInsert(array(), $roo);
     }
-    function    lookupOwner()
+    function lookupOwner()
     {
-        $enum = DB_DataObject::Factory('core_enum')->lookup('COMPTYPE', $ctype  );
+        $enum = DB_DataObject::Factory('core_enum')->lookup('COMPTYPE', 'OWNER'  );
         $companies = DB_DataObject::factory('companies');
         $companies->comptype_id = $enum;
         if ($companies->find(true)) {