X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=UpdateDatabase.php;h=ee26b73a391db4c35f3e92bd8f50aaca9c958b41;hb=cd0367f0b1c72b3bf7140f594c7e54ef2ed94c9e;hp=f00252d20493ec7aceed7e953abe52e535b2453c;hpb=3872f9bedb2720b72c8f8a5e16629c808796b2c9;p=Pman.Core

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index f00252d2..ee26b73a 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -689,7 +689,8 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function updateDataEnums()
     {
-        
+        HTML_FlexyFramework::get()->generateDataobjectsCache(true);
+
         $enum = DB_DataObject::Factory('core_enum');
         //DB_DAtaObject::debugLevel(1);
         $enum->initEnums(
@@ -816,16 +817,17 @@ class Pman_Core_UpdateDatabase extends Pman
     }
     
     
-    function initEmails($templateDir, $emails)
+    function initEmails($templateDir, $emails, $mapping = false)
     {
-        
+        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");
                 }
@@ -848,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']);
                 
@@ -862,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(
@@ -907,7 +909,7 @@ class Pman_Core_UpdateDatabase extends Pman
             require_once 'Pman/Core/Import/Core_email.php';
             $x = new Pman_Core_Import_Core_email();
             
-            $x->updateOrCreateEmail('', $opts, $cm);
+            $x->updateOrCreateEmail('', $opts, $cm, $mapping);
             
             echo "email: {$name} - CREATED\n";
         }