Merge pull request osTicket#3062 from protich/issue/org-delete

org: Remove users from deleted org. Reviewed-By: Jared Hancock <[email protected]>
jezuk · Apr 24, 2016 · 4e82f2e · 4e82f2e
2 parents 0979868 + 45dd2a6
commit 4e82f2e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/include/class.orm.php b/include/class.orm.php
@@ -229,6 +229,17 @@ function getFieldNames() {
         return $this->fields;
     }
 
+    function getByPath($path) {
+        if (is_string($path))
+            $path = explode('__', $path);
+        $root = $this;
+        foreach ($path as $P) {
+            list($root, ) = $root['joins'][$P]['fkey'];
+            $root = $root::getMeta();
+        }
+        return $root;
+    }
+
     /**
      * Create a new instance of the model, optionally hydrating it with the
      * given hash table. The constructor is not called, which leaves the
@@ -2249,9 +2260,22 @@ function compileQ(Q $Q, $model, $slot=false) {
             // Handle relationship comparisons with model objects
             elseif ($value instanceof VerySimpleModel) {
                 $criteria = array();
-                foreach ($value->pk as $f=>$v) {
-                    $f = $field . '__' . $f;
-                    $criteria[$f] = $v;
+                // Avoid a join if possible. Use the local side of the
+                // relationship
+                if (count($value->pk) === 1) {
+                    $path = explode('__', $field);
+                    $relationship = array_pop($path);
+                    $lmodel = $model::getMeta()->getByPath($path);
+                    $local = $lmodel['joins'][$relationship]['local'];
+                    $path = $path ? (implode('__', $path) . '__') : '';
+                    foreach ($value->pk as $v) {
+                        $criteria["{$path}{$local}"] = $v;
+                   }
+                }
+                else {
+                    foreach ($value->pk as $f=>$v) {
+                        $criteria["{$field}__{$f}"] = $v;
+                    }
                 }
                 $filter[] = $this->compileQ(new Q($criteria), $model, $slot);
             }

diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
@@ -309,7 +309,7 @@ class="icon-folder-close-alt icon-fixed-width"></i> %s</a></li>',
                         <span id="user-<?php echo $ticket->getOwnerId(); ?>-email"><?php echo $ticket->getEmail(); ?></span>
                     </td>
                 </tr>
-<?php   if ($user->getOrgId()) { ?>
+<?php   if ($user->getOrganization()) { ?>
                 <tr>
                     <th><?php echo __('Organization'); ?>:</th>
                     <td><i class="icon-building"></i>