From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Mon, 25 Oct 2010 20:55:45 +0000 (+0200)
Subject: Closes #1283 : restricts second operation on promo search
X-Git-Tag: xorg/1.0.1~9
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;ds=sidebyside;h=89ee88f2c05963b6e4fea57bf7050b2bfafbc0f2;hp=f31c2a2484c122c1ed4928cb9d461917069e4418;p=platal.git

Closes #1283 : restricts second operation on promo search
---

diff --git a/ChangeLog b/ChangeLog
index 68f5dde..e849520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,8 +34,9 @@ Bug/Wish:
         - #1261: Fix wrong join between user and profile                   -JAC
 
     * Search:
-        - #1177: clean url in advanced search                              -Car
+        - #1177: Clean url in advanced search                              -Car
         - #1251: More intuitive networking search                          -Xel
+        - #1283: Restrict second operation on promo search                 -Car
 
     * Survey:
         - #964: The creator of a survey can get early results              -FRU
diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 7ba93b5..4bd8fa1 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -248,18 +248,29 @@ function cleanForm(f) {
     <tr>
       <td>Promotion</td>
       <td>
-        <select name="egal1">
+        <script type="text/javascript">/*<![CDATA[*/
+          {literal}
+          function updatepromofields(egal1) {
+            var f = egal1.form;
+            f.egal2.disabled = f.promo2.disabled = egal1.value == '=';
+            f.egal2.readOnly = true;
+            if (f.egal1.value == '>=') {
+              f.egal2.value = '<=';
+            } else {
+              f.egal2.value = '>=';
+            }
+          }
+          $(document).ready(function() { updatepromofields($('select[name=egal1]')[0]); });
+          {/literal}
+        /*]]>*/</script>
+        <select name="egal1" onchange="updatepromofields(this)" style="text-align:center">
           <option value="=" {if $smarty.request.egal1 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
           <option value="&gt;=" {if $smarty.request.egal1 eq "&gt;="}selected="selected"{/if}>&nbsp;&gt;=&nbsp;</option>
           <option value="&lt;=" {if $smarty.request.egal1 eq "&lt;="}selected="selected"{/if}>&nbsp;&lt;=&nbsp;</option>
         </select>
         <input type="text" name="promo1" size="4" maxlength="4" value="{$smarty.request.promo1}" />
         &nbsp;et&nbsp;
-        <select name="egal2">
-          <option value="=" {if $smarty.request.egal2 eq "="}selected="selected"{/if}>&nbsp;=&nbsp;</option>
-          <option value="&gt;=" {if $smarty.request.egal2 eq "&gt;="}selected="selected"{/if}>&nbsp;&gt;=&nbsp;</option>
-          <option value="&lt;=" {if $smarty.request.egal2 neq "&gt;=" && $smarty.request.egal2 neq "="}selected="selected"{/if}>&nbsp;&lt;=&nbsp;</option>
-        </select>
+        <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}" />
       </td>
     </tr>