Changeset 3922

Timestamp:

07/11/11 17:31:22 (11 months ago)

Author:

tboutell

Message:

Fixed #570

Location:

plugins/apostrophePeoplePlugin/branches/0.1

Files:

• config/apostrophePeoplePluginConfiguration.class.php (added)
• lib/model/doctrine/PluginaPersonTable.class.php (modified) (1 diff)
• lib/model/doctrine/PluginaPersonToACategory.class.php (modified) (1 diff)
• lib/model/doctrine/PluginaPersonToACategoryTable.class.php (modified) (1 diff)

plugins/apostrophePeoplePlugin/branches/0.1/lib/model/doctrine/PluginaPersonTable.class.php

@@ -65 +65 @@
   {
     return aEngineTools::getEngineCategories('aPeople');
-  }
+  }  
 }

plugins/apostrophePeoplePlugin/branches/0.1/lib/model/doctrine/PluginaPersonToACategory.class.php

@@ -13 +13 @@
 abstract class PluginaPersonToACategory extends BaseaPersonToACategory
 {
-
 }

plugins/apostrophePeoplePlugin/branches/0.1/lib/model/doctrine/PluginaPersonToACategoryTable.class.php

@@ -17 +17 @@
         return Doctrine_Core::getTable('PluginaPersonToACategory');
     }
+    
+    public function mergeCategory($old_id, $new_id)
+    {
+      Doctrine::getTable('aCategory')->mergeCategory($old_id, $new_id, 'aPersonToACategory', 'category_id', true, 'person_id');
+    }
 }