X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=GroupMembers.php;h=f501042efc09d5b65267fe354bdd20b1c200f1ff;hp=c3428a790c39ca631c23e102dfeec8af08a47ef3;hb=refs%2Fheads%2Fwip_alan_T6343_generic_progress_bar_delete;hpb=57b9f2948c309d6f4a6aeb006a5527d79266b4a3

diff --git a/GroupMembers.php b/GroupMembers.php
index c3428a79..f501042e 100644
--- a/GroupMembers.php
+++ b/GroupMembers.php
@@ -25,7 +25,7 @@ class Pman_Core_GroupMembers extends Pman
     }
     
      
-    function get()
+    function get($v, $opts=array())
     {
         // must recieve a group..
         if (empty($_GET['group_id']) || (int)$_GET['group_id'] < 1) {
@@ -43,7 +43,7 @@ class Pman_Core_GroupMembers extends Pman
         
         // Groups are only usable by owner company!!!
         
-        $u = DB_DataObject::factory('Person');
+        $u = DB_DataObject::factory('core_person');
         $u->company_id = $this->company->id;
         //$this->setFilters($u,$_GET);
         $u->active = 1; // active staff only..
@@ -87,7 +87,7 @@ class Pman_Core_GroupMembers extends Pman
         
         
         
-        $p = DB_DataObject::factory('group_members');
+        $p = DB_DataObject::factory('core_group_member');
         $p->group_id = (int)$_GET['group_id'];
         $p->whereAdd('user_id IN ('. implode(',' ,array_keys($ret) ). ')');
         $p->find();
@@ -103,7 +103,7 @@ class Pman_Core_GroupMembers extends Pman
          
     }
     
-    function post()
+    function post($v)
     {
         if (empty($_POST['group_id']) || (int)$_POST['group_id'] < 1) {
             $this->jerr("NO GROUP");
@@ -119,16 +119,23 @@ class Pman_Core_GroupMembers extends Pman
             // add
             $ar = explode(',', $_POST['user_ids']);
             $ac = $_POST['action'];
-            $g = DB_DataObject::factory('Groups');
+            $g = DB_DataObject::factory('core_group');
             $g->get($_POST['group_id']);
             // check type????
             foreach($ar as $uid) {
-                $pi = DB_DataObject::factory('Person');
+                $pi = DB_DataObject::factory('core_person');
                 $pi->get($uid);
                     
-                $p = DB_DataObject::factory('group_members');
+                $p = DB_DataObject::factory('core_group_member');
                 $p->group_id = (int)$_POST['group_id'];
                 $p->user_id = $uid;
+                
+                
+                if (($pi->company()->comptype != 'OWNER') && !$g->type) {
+                    $this->jerr("can not add non-owner contact to system group");
+                }
+                
+                
                 //$p->type = (int)$_POST['type'];
                 $p->find(true);
                 if (($ac == 'sub') && $p->id) {
@@ -155,7 +162,7 @@ class Pman_Core_GroupMembers extends Pman
            
             
             foreach($_POST['dataDelete'] as $id => $ac) {
-                $m = DB_DataObject::factory('group_members');
+                $m = DB_DataObject::factory('core_group_member');
                 $m->get($id);
                 $m->delete();
             }
@@ -165,7 +172,7 @@ class Pman_Core_GroupMembers extends Pman
         if (!empty($_POST['dataAdd'])) {
              
             foreach($_POST['dataAdd'] as $id => $ac) {
-                $p = DB_DataObject::factory('group_members');
+                $p = DB_DataObject::factory('core_group_member');
                 $p->group_id = (int)$_POST['group_id'];
                 $p->user_id = $id;
                 $p->insert();