add filtering by delegate + bump version

symphonists · Oct 6, 2016 · c886dca · c886dca
1 parent 16e1c30
commit c886dca
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/extension.meta.xml b/extension.meta.xml
@@ -13,6 +13,10 @@
 		</author>
 	</authors>
 	<releases>
+		<release version="1.1.0" date="2016-02-22" min="2.5">
+			- Added new `AssociationFiltering` delegate allowing extension to filter results
+			- Fix MySQL 5.7 Distinct, order by error when in strict mode
+		</release>
 		<release version="1.0.1" date="2015-07-21" min="2.5">
 			- Removed association count from index for single select fields
 		</release>

diff --git a/fields/field.association.php b/fields/field.association.php
@@ -121,8 +121,29 @@ public function findOptions(array $selected_ids = array(), $entry_id = null)
                 );
 
                 if ($limit > 0) {
+
+                    $where = '';
+                    $joins = '';
+
+                    /**
+                     * Allow the results to be modified using adjust publish filtering functionality on the core
+                     *
+                     * @delegate AssociationFiltering
+                     * @since Symphony 1.1.0
+                     * @param string $context
+                     * '/publish/'
+                     * @param array $options
+                     *  An array which should contain the section id
+                     *  and the joins and where clauses by reference both passed by reference
+                     */
+                    Symphony::ExtensionManager()->notifyMembers('AssociationFiltering', '/publish/', array(
+                        'section-id' => $section->get('id'),
+                        'joins' => &$joins,
+                        'where' => &$where
+                    ));
+
                     EntryManager::setFetchSorting($section->getSortingField(), $section->getSortingOrder());
-                    $entries = EntryManager::fetch(null, $section->get('id'), $limit, 0, null, null, false, false);
+                    $entries = EntryManager::fetch(null, $section->get('id'), $limit, 0, $where, $joins, false, false);
                     foreach ($entries as $entry) {
                         $results[] = (int) $entry['id'];
                     }