From: Andrey Kutejko <andy128k@gmail.com>
Date: Wed, 20 Nov 2013 18:21:45 +0000 (+0200)
Subject: respect model ordering in admin filters
X-Git-Tag: 0.5~16
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=b11cec8ea8444f4f55681a2b922d26a8c66e8d43;p=ipf.git

respect model ordering in admin filters
---

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index f2e1d3e..de353ca 100644
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -827,7 +827,17 @@ class IPF_Admin_Model
                     'name'=>'All',
                     'selected'=>($sel_id==''),
                 );
-                foreach (IPF_ORM::getTable($rels[$f]['class'])->findAll() as $val){
+
+                $table = IPF_ORM::getTable($rels[$f]['class']);
+
+                $query = $table->createQuery();
+                if ($table->getOrdering()) {
+                    $query->orderBy(implode(', ', $table->getOrdering()));
+                } elseif ($table->hasTemplate('IPF_ORM_Template_Orderable')) {
+                    $query->orderBy($table->getTemplate('IPF_ORM_Template_Orderable')->getColumnName());
+                }
+
+                foreach ($query->execute() as $val) {
                     $selected = false;
                     $id = $val[$foreign];
                     if ($sel_id==$id)