Add filterable list item props for users and orgs

include/class.dynamic_forms.php

@@ -244,6 +244,12 @@ Filter::addSupportedMatches('User Data', function() {
         if (!$f->hasData())
             continue;
         $matches['field.'.$f->get('id')] = 'User / '.$f->getLabel();
+        if (($fi = $f->getImpl()) instanceof SelectionField) {
+            foreach ($fi->getList()->getProperties() as $p) {
+                $matches['field.'.$f->get('id').'.'.$p->get('id')]
+                    = 'User / '.$f->getLabel().' / '.$p->getLabel();
+            }
+        }
     }
     return $matches;
 }, 20);
@@ -328,9 +334,8 @@ Filter::addSupportedMatches('Ticket Data', function() {
         if (!$f->hasData())
             continue;
         $matches['field.'.$f->get('id')] = 'Ticket / '.$f->getLabel();
-        if (strpos($f->get('type'), 'list-') === 0) {
-            list(,$id) = explode('-', $f->get('type'));
-            foreach (DynamicList::lookup($id)->getProperties() as $p) {
+        if (($fi = $f->getImpl()) instanceof SelectionField) {
+            foreach ($fi->getList()->getProperties() as $p) {
                 $matches['field.'.$f->get('id').'.'.$p->get('id')]
                     = 'Ticket / '.$f->getLabel().' / '.$p->getLabel();
             }

include/class.organization.php

@@ -426,6 +426,12 @@ Filter::addSupportedMatches('Organization Data', function() {
         if (!$f->hasData())
             continue;
         $matches['field.'.$f->get('id')] = 'Organization / '.$f->getLabel();
+        if (($fi = $f->getImpl()) instanceof SelectionField) {
+            foreach ($fi->getList()->getProperties() as $p) {
+                $matches['field.'.$f->get('id').'.'.$p->get('id')]
+                    = 'Organization / '.$f->getLabel().' / '.$p->getLabel();
+            }
+        }
     }
     return $matches;
 },40);