From 99f1bdfdb3dce1107bca653653e9b6fe2871b8df Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Fri, 13 May 2011 10:21:47 +0200
Subject: [PATCH] Fixes promotion selection in newsletter.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 include/ufbuilder.inc.php     | 4 ++--
 templates/newsletter/edit.tpl | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php
index 8e8fea3..7b8a979 100644
--- a/include/ufbuilder.inc.php
+++ b/include/ufbuilder.inc.php
@@ -445,8 +445,8 @@ class UFB_NewsLetter extends UserFilterBuilder
     {
         $fields = array();
         if ($flags->hasFlag(self::FIELDS_PROMO)) {
-            $fields[] = new UFBF_Promo('promo1', 'Promotion', 'egal1');
-            $fields[] = new UFBF_Promo('promo2', 'Promotion', 'egal2');
+            $fields[] = new UFBF_Promo('promo1', 'Promotion', 'egal1', 'edu_type');
+            $fields[] = new UFBF_Promo('promo2', 'Promotion', 'egal2', 'edu_type');
         }
         if ($flags->hasFlag(self::FIELDS_AXID)) {
             $fields[] = new UFBF_SchoolIds('axid', 'Matricule AX', UFC_SchoolId::AX);
diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl
index 90ae27f..143f4cd 100644
--- a/templates/newsletter/edit.tpl
+++ b/templates/newsletter/edit.tpl
@@ -175,6 +175,11 @@
           &nbsp;et&nbsp;
           <input type="text" name="egal2" size="1" style="text-align:center" value="{if t($smarty.request.egal2) eq '&lt;'}&lt;{else}&gt;{/if}" readonly="readonly" />
           <input type="text" name="promo2" size="4" maxlength="4" value="{$smarty.request.promo2}" />
+          <select name="edu_type" style="text-align:center">
+            <option value="{#UserFilter::GRADE_ING#}" {if $smarty.request.edu_type eq #UserFilter::GRADE_ING#}selected="selected"{/if}>X</option>
+            <option value="{#UserFilter::GRADE_MST#}" {if $smarty.request.edu_type eq #UserFilter::GRADE_MST#}selected="selected"{/if}>Master</option>
+            <option value="{#UserFilter::GRADE_PHD#}" {if $smarty.request.edu_type eq #UserFilter::GRADE_PHD#}selected="selected"{/if}>Docteur</option>
+          </select>
         </td>
       </tr>
       {/if}
-- 
2.1.4