From: john <john@roojs.com>
Date: Mon, 9 Apr 2018 08:32:49 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ea334e2031f46ccebecd4baa288f917b89a15b40;hp=949ef8513c62b4cabae3f36926f610385dce2032

sync
---

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 5bb7b2c7..170c2a10 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -43,25 +43,23 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         $cgm = DB_DataObject::Factory('core_group_member')->tableName();;
       
         $this->selectAdd("
-           (
-            SELECT 
-                count(user_id) 
-            FROM 
-                {$cgm}
-            WHERE 
-                to_group_id = {$cgm}.group_id
-            ) 
-            AS group_member_count,
+            (
+                SELECT 
+                    count(id) 
+                FROM 
+                    {$cgm}
+                WHERE 
+                    to_group_id = {$cgm}.group_id
+            )  AS group_member_count,
             
-           (
-            SELECT 
-                count(user_id) 
-            FROM 
-                {$cgm}
-            WHERE 
-                bcc_group_id = {$cgm}.group_id
-           ) 
-           AS bcc_group_member_count
+            (
+                SELECT 
+                    count(id) 
+                FROM 
+                    {$cgm}
+                WHERE 
+                    bcc_group_id = {$cgm}.group_id
+            )  AS bcc_group_member_count
         ");
     }
     
diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index b8c7194f..b80ef81c 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -1179,8 +1179,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             return;
         }
         $c = DB_DataObject::Factory('core_company');
-        $tc =$c->count();
-        
+        $tc = $c->count();
         if (!$tc || $tc> 1) {
             $roo->jerr("can not create initial user as multiple companies already exist");
         }
diff --git a/DataObjects/pman.links.ini b/DataObjects/pman.links.ini
index 340f7bd4..60284257 100644
--- a/DataObjects/pman.links.ini
+++ b/DataObjects/pman.links.ini
@@ -73,8 +73,8 @@ method_id = core_enum:id
 
 [core_email]
 owner_id = core_person:id
-bcc_group = core_group:id
-to_group = core_group:id
+bcc_group_id = core_group:id
+to_group_id = core_group:id
 
 
 [core_ip_access]
diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 3546602f..6f7e14fc 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -819,14 +819,15 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function initEmails($templateDir, $emails)
     {
-        
+        HTML_FlexyFramework::get()->generateDataobjectsCache(true);
+
         $pg = HTML_FlexyFramework::get()->page;
         foreach($emails as $name=>$data) {
             $cm = DB_DataObject::factory('core_email');
             $update = $cm->get('name', $name);
             $old = clone($cm);
             
-            if (empty($cm->bcc_group)) {
+            if (empty($cm->bcc_group_id)) {
                 if (empty($data['bcc_group'])) {
                     $this->jerr("missing bcc_group for template $name");
                 }
@@ -849,13 +850,13 @@ class Pman_Core_UpdateDatabase extends Pman
                 }
                 $cm->test_class = $data['test_class'];
             //}
-            if(isset($cm->to_group)) {
+            if(isset($cm->to_group_id)) {
                 print_r('isset');
             }
             
             if (
                 !empty($data['to_group']) &&
-                (!isset($cm->to_group) || !empty($cm->to_group)) 
+                (!isset($cm->to_group_id) || !empty($cm->to_group_id)) 
             ) {
                 $gp = DB_DataObject::Factory('core_group')->lookup('name',$data['to_group']);
                 
@@ -863,7 +864,7 @@ class Pman_Core_UpdateDatabase extends Pman
                     $this->jerr("to_group {$data['to_group']} does not exist when importing template $name");
                 }
                 
-                $cm->to_group = $gp->id;
+                $cm->to_group_id = $gp->id;
             }
             
             if(
diff --git a/sql/core_email.sql b/sql/core_email.sql
index f512ef88..2f0cbb18 100644
--- a/sql/core_email.sql
+++ b/sql/core_email.sql
@@ -16,7 +16,7 @@ ALTER TABLE core_email CHANGE COLUMN active active INT(2) NOT NULL DEFAULT 1;
 ALTER TABLE core_email ADD COLUMN active INT(2) NOT NULL DEFAULT 1;
 
 -- need to store BCC data here.
-ALTER TABLE core_email CHANGE COLUMN bcc_group_ bcc_group_id INT(11) NOT NULL DEFAULT 0;
+ALTER TABLE core_email CHANGE COLUMN bcc_group bcc_group_id INT(11) NOT NULL DEFAULT 0;
 ALTER TABLE core_email ADD COLUMN bcc_group_id INT(11) NOT NULL DEFAULT 0;
 
 -- each email template should have  a test class with a static method ::test_{name}
@@ -24,7 +24,9 @@ ALTER TABLE core_email CHANGE COLUMN test_class test_class VARCHAR(254) NOT NULL
 ALTER TABLE core_email ADD COLUMN test_class VARCHAR(254) NOT NULL DEFAULT '';
 
 ALTER TABLE core_email CHANGE COLUMN  in_group to_group_id INT(11) NOT NULL DEFAULT -1;
+ALTER TABLE core_email CHANGE COLUMN  to_group to_group_id INT(11) NOT NULL DEFAULT -1;
 ALTER TABLE core_email ADD COLUMN    to_group_id INT(11) NOT NULL DEFAULT -1;
 
+
 UPDATE core_email SET updated_dt = NOW() where updated_dt IS NULL;