From c5e1acb3beb8f5c1890e417a5dd41e0d8beb6c89 Mon Sep 17 00:00:00 2001
From: john <john@roojs.com>
Date: Wed, 24 Jan 2018 12:20:12 +0800
Subject: [PATCH] UpdateDatabase.php

---
 UpdateDatabase.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 79fdab62..abef7cbc 100644
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -847,7 +847,7 @@ class Pman_Core_UpdateDatabase extends Pman
                 $cm->test_class = $data['test_class'];
             //}
             
-            if (!empty($data['to_group'])) {
+            if (!empty($data['to_group']) && !isset($cm->to_group)) {
                 
                 $gp = DB_DataObject::Factory('core_group')->lookup('name',$data['to_group']);
                 
@@ -858,6 +858,19 @@ class Pman_Core_UpdateDatabase extends Pman
                 $cm->to_group = $gp->id;
             }
             
+            if(isset($cm->to_group)) {
+                if($cm->to_group > 0) {
+                    
+                    $gp = DB_DataObject::Factory('core_group')->lookup('name',$data['to_group']);
+                    
+                    if (empty($gp->id)) {
+                        $this->jerr("to_group {$data['to_group']} does not exist when importing template $name");
+                    }
+                    
+                    $cm->to_group = $gp->id;
+                }
+            }
+            
             if(isset($data['active'])) {
                 $cm->active = $data['active'];
             }
-- 
2.39.2