split groups from owners so validate won't fail

horde · Oct 1, 2015 · b2d6b51 · b2d6b51
1 parent cbb6366
commit b2d6b51
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/whups/lib/Api.php b/whups/lib/Api.php
@@ -215,7 +215,7 @@ public function updateTicket($ticket_id, $ticket_info)
 
         // Populate $vars with existing ticket details.
         $vars = new Horde_Variables();
-        $ticket->setDetails($vars);
+        $ticket->setDetails($vars, true);
 
         // Copy new ticket details in.
         foreach ($ticket_info as $detail => $newval) {

diff --git a/whups/lib/Ticket.php b/whups/lib/Ticket.php
@@ -646,12 +646,27 @@ public static function addCommentPerms($commentId, $group)
      * TicketDetailsForm.
      *
      * @param Horde_Variables $vars  The form variables object to set info in.
+     * @param bool $split_owners     This has to be set if you want to use the
+     *                               $vars var for saving later or otherwise
+     *                               $form->validate() will fail
      */
-    public function setDetails(Horde_Variables $vars)
+    public function setDetails(Horde_Variables $vars, $split_owners = false)
     {
         $vars->set('id', $this->getId());
         foreach ($this->getDetails() as $varname => $value) {
-            $vars->set($varname, $value);
+            if ($varname == 'owners') {
+                $owners = $gowners = array();
+                foreach ($value as $owner) {
+                    if (strpos($owner, 'user:') !== false) {
+                        $owners[] = $owner;
+                    } else {
+                        $gowners[] = $owner;
+                    }
+                }
+                $vars->add('owners', $owners);
+                $vars->add('group_owners', $gowners);
+            }
+            $vars->add($varname, $value);
         }
 
         /* User formatting. */

diff --git a/whups/ticket/update.php b/whups/ticket/update.php
@@ -22,22 +22,8 @@
 Whups::addTopbarSearch();
 
 $vars = Horde_Variables::getDefaultVariables();
-$vars->set('id', $id = $ticket->getId());
-foreach ($ticket->getDetails() as $varname => $value) {
-    if ($varname == 'owners') {
-        $owners = $gowners = array();
-        foreach ($value as $owner) {
-            if (strpos($owner, 'user:') !== false) {
-                $owners[] = $owner;
-            } else {
-                $gowners[] = $owner;
-            }
-        }
-        $vars->add('owners', $owners);
-        $vars->add('group_owners', $gowners);
-    }
-    $vars->add($varname, $value);
-}
+$ticket->setDetails($vars, true);
+$id = $vars->id;
 if ($tid = $vars->get('transaction')) {
     $history = Whups::permissionsFilter($whups_driver->getHistory($ticket->getId()),
                                         'comment', Horde_Perms::READ);