From 999db5aac2f6aeed2e494268843713a6ff8f9f64 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Sun, 4 Jul 2010 01:46:19 +0200 Subject: [PATCH] Fix filtering by promos on advanced search MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- classes/userfilter.php | 3 ++- include/ufbuilder.inc.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/userfilter.php b/classes/userfilter.php index cc8a611..058def4 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -156,7 +156,8 @@ class UFC_Promo implements UserFilterCondition UserFilter::assertGrade($this->grade); } if ($this->grade == UserFilter::DISPLAY && $this->comparison != '=') { - Platal::page()->killError('Comparison ' . $this->comparison . ' not allowed on displaid promo'); + // XXX: we might try to guess the grade from the first char of the promo and forbid only '<= 2004', but allow '<= X2004' + Platal::page()->killError("Il n'est pas possible d'appliquer la comparaison '" . $this->comparison . "' aux promotions sans spécifier de formation (X/M/D)"); } } diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php index 7e37f02..6475f98 100644 --- a/include/ufbuilder.inc.php +++ b/include/ufbuilder.inc.php @@ -620,7 +620,7 @@ class UFBF_Promo extends UFB_Field } protected function buildUFC(UserFilterBuilder &$ufb) { - return new UFC_Promo($this->comp, UserFilter::DISPLAY, 'X' . $this->val); + return new UFC_Promo($this->comp, UserFilter::GRADE_ING, $this->val); } } // }}} -- 2.1.4