Bug: 14112 Remove tags when deleting objects.

horde · Sep 16, 2015 · 1b3e4ed · 1b3e4ed
1 parent da5e575
commit 1b3e4ed
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/mnemo/lib/Driver.php b/mnemo/lib/Driver.php
@@ -261,7 +261,12 @@ public function delete($noteId)
                           array('action' => 'delete'), true);
             } catch (Horde_Exception $e) {
             }
+
+            // Remove tags
+            $GLOBALS['injector']->getInstance('Mnemo_Tagger')
+                ->replaceTags($uid, array(), $GLOBALS['registry']->getAuth(), 'note')
         }
+
     }
 
     /**
@@ -291,6 +296,8 @@ public function deleteAll()
                     'mnemo:' . $this->_notepad . ':' . $uid,
                     array('action' => 'delete'),
                     true);
+                $injector->getInstance('Mnemo_Tagger')
+                    ->replaceTags($uid, array(), $GLOBALS['registry']->getAuth(), 'note');
             }
         } catch (Horde_Exception $e) {
         }

diff --git a/nag/lib/Driver.php b/nag/lib/Driver.php
@@ -400,6 +400,10 @@ public function delete($taskId)
         $task = $this->get($taskId);
         $delete = $this->_delete($taskId);
 
+        /* Remove tags */
+        $task->tags = array();
+        $this->_updateTags($task);
+
         /* Log the deletion of this item in the history log. */
         if (!empty($task->uid)) {
             try {
@@ -444,14 +448,17 @@ public function deleteAll()
     {
         $ids = $this->_deleteAll();
 
-        // Update History.
+        // Update History and Tagger
         $history = $GLOBALS['injector']->getInstance('Horde_History');
         try {
             foreach ($ids as $id) {
                 $history->log(
                     'nag:' . $this->_tasklist . ':' . $id,
                     array('action' => 'delete'),
                     true);
+
+                $GLOBALS['injector']->getInstance('Nag_Tagger')
+                    ->replaceTags($id, array(), $GLOBALS['registry']->getAuth(), 'task');
             }
         } catch (Exception $e) {
             Horde::log($e, 'ERR');

diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php
@@ -1065,6 +1065,10 @@ public function delete($object_id)
             }
         } catch (Horde_Exception $e) {
         }
+
+        /* Remove tags */
+        $GLOBALS['injector']->getInstance('Turba_Tagger')
+            ->replaceTags($object->getValue('__uid'), array(), $this->getContactOwner(), 'contact');
     }
 
     /**
@@ -1085,7 +1089,7 @@ public function deleteAll($sourceName = null)
 
         $ids = $this->_deleteAll($sourceName);
 
-        // Update Horde_History
+        // Update Horde_History and Tagger
         $history = $GLOBALS['injector']->getInstance('Horde_History');
         try {
             foreach ($ids as $id) {
@@ -1095,6 +1099,10 @@ public function deleteAll($sourceName = null)
                 // Turba_Object#getGuid
                 $guid = 'turba:' . $this->getName() . ':' . $id;
                 $history->log($guid, array('action' => 'delete'), true);
+
+                // Remove tags.
+                $GLOBALS['injector']->getInstance('Turba_Tagger')
+                    ->replaceTags($id, array(), $this->getContactOwner(), 'contact');
             }
         } catch (Exception $e) {
             Horde::log($e, 'ERR');