Просмотр исходного кода

Merge branch 'master' of https://github.com/unaio/una

AntonLV 2 лет назад
Родитель
Сommit
a50ca86a16

+ 12 - 0
modules/boonex/tasks/classes/BxTasksFormsEntryHelper.php

@@ -31,6 +31,18 @@ class BxTasksFormsEntryHelper extends BxBaseModTextFormsEntryHelper
             'profile_id' => bx_get_logged_profile_id(),
         ));
     }
+
+    public function onDataDeleteAfter ($iContentId, $aContentInfo, $oProfile)
+    {
+        $s = parent::onDataDeleteAfter ($iContentId, $aContentInfo, $oProfile);
+        if(!empty($s))
+            return $s;
+
+        $CNF = &$this->_oModule->_oConfig->CNF;
+        $oConnection = BxDolConnection::getObjectInstance($CNF['OBJECT_CONNECTION']);
+        $oConnection->onDeleteContent($iContentId);
+        return '';
+    }
 }
 
 /** @} */

+ 10 - 2
modules/boonex/tasks/classes/BxTasksModule.php

@@ -151,8 +151,16 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
     {
         if (!$this->isAllowManageByContext($iContextId))
             return;
-        
-        $this->_oDb->deleteList($iId);  
+
+        $CNF = &$this->_oConfig->CNF;
+
+        $aTasks = $this->_oDb->getTasks($iContextId, $iId);
+        $this->_oDb->deleteList($iId);
+        if (!empty($aTasks) && ($oConn = BxDolConnection::getObjectInstance($this->_oConfig->CNF['OBJECT_CONNECTION']))) {
+            foreach ($aTasks as &$aTask)
+                $oConn->onDeleteContent($aTask[$CNF['FIELD_ID']]);
+        }
+
         echoJson(array(
             'context_id' => $iContextId,
         ));