revision for advance search form

viewable , datefield max year is based on current time

diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index 388c92a15b6b7b5f43b1231c53ad497d3ee4d429..8dfe9c52c9722d752d6cbef87ab55d26987004df 100644 (file)
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -2,6 +2,7 @@
 from telemeta.models import *
 from haystack.forms import *
 from haystack.query import SearchQuerySet
+from datetime import date
 
 
 class HaySearchForm(FacetedSearchForm):
@@ -64,14 +65,11 @@ class HayAdvanceForm(SearchForm):
         list_all_year.sort()
         if len(list_all_year) >= 2:
             min_year = list_all_year[len(list_all_year) - 1]
-            max_year = list_all_year[len(list_all_year) - 1]
             for year in list_all_year:
                 if year != 0:
                     if year < min_year:
                         min_year = year
-                    if year > max_year:
-                        max_year = year
-            list_all_year = range(min_year, max_year + 1)
+            list_all_year = range(min_year, date.today().year + 1)
         list_year = []
         list_year.append(('', '----'))
         for year in list_all_year:
@@ -91,14 +89,11 @@ class HayAdvanceForm(SearchForm):
         list_all_year.sort()
         if len(list_all_year) >= 2:
             min_year = list_all_year[len(list_all_year) - 1]
-            max_year = list_all_year[len(list_all_year) - 1]
             for year in list_all_year:
                 if year != 0:
                     if year < min_year:
                         min_year = year
-                    if year > max_year:
-                        max_year = year
-            list_all_year = range(min_year, max_year + 1)
+            list_all_year = range(min_year, date.today().year + 1)
         list_year = []
         list_year.append((0, '----'))
         for year in list_all_year:
@@ -108,7 +103,7 @@ class HayAdvanceForm(SearchForm):
     year_published_from = forms.IntegerField(required=False, label=('Year published from'), widget=forms.Select(attrs={'style': 'width:47%'}, choices=list_publish_year()))
     year_published_to = forms.IntegerField(required=False, label=('Year published to'), widget=forms.Select(attrs={'style': 'width:47%'}, choices=list_publish_year()))
 
-    viewable_choice = (('1', 'no preference'), ('2', 'fichier dans le player + full'), ('3', 'fichier dans le player(j\'ai un compte)'))
+    viewable_choice = (('1', 'no preference'), ('2', 'online and public'), ('3', 'online and private (account required)'))
     viewable = forms.CharField(required=False, label=('Viewable'), widget=forms.RadioSelect(choices=viewable_choice), initial=1)
 
     item_status = forms.CharField(required=False, label=('Item Status'), widget=forms.RadioSelect(choices=(('1', 'no preference'), ('pub', 'Published'), ('unpub', 'Unpublished'))), initial=1)

diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index af7e68b13930cf07f71a146bfacfac259ed16aba..6ce50f754da7106957a42835beeb5ee4bb1ebce7 100644 (file)
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -111,17 +111,17 @@
                     <ul id="id_viewable" style="margin-left:-40px">
                         {%ifequal query.viewable '2'%}
                             <li><label for="id_viewable_0">{% trans "no preference" %}</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
-                            <li><label for="id_viewable_1">{% trans "fichier dans le player + full" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable" checked="checked"></input></li>
-                            <li><label for="id_viewable_2">{% trans "fichier dans le player (j'ai un compte)" %}</label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
+                            <li><label for="id_viewable_1">{% trans "online and public" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable" checked="checked"></input></li>
+                            <li><label for="id_viewable_2">{% trans "online and private (account required)" %}</label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
                         {%else%}
                             {%ifequal query.viewable '3'%}
                                 <li><label for="id_viewable_0">{% trans "no preference" %}</label><input id="id_viewable_0" type="radio" value="1" name="viewable"></input></li>
-                                <li><label for="id_viewable_1">{% trans "fichier dans le player + full" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
-                                <li><label for="id_viewable_2">{% trans "fichier dans le player (j'ai un compte)" %}</label><input id="id_viewable_2" type="radio" value="3" name="viewable" checked="checked"></input></li>
+                                <li><label for="id_viewable_1">{% trans "online and public" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
+                                <li><label for="id_viewable_2">{% trans "online and private (account required)" %}</label><input id="id_viewable_2" type="radio" value="3" name="viewable" checked="checked"></input></li>
                             {%else%}
                                 <li><label for="id_viewable_0">{% trans "no preference" %}</label><input id="id_viewable_0" type="radio" value="1" name="viewable" checked="checked"></input></li>
-                                <li><label for="id_viewable_1">{% trans "fichier dans le player + full" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
-                                <li><label for="id_viewable_2">{% trans "fichier dans le player (j'ai un compte)" %} </label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
+                                <li><label for="id_viewable_1">{% trans "online and public" %}</label><input id="id_viewable_1" type="radio" value="2" name="viewable"></input></li>
+                                <li><label for="id_viewable_2">{% trans "online and private (account required)" %} </label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
                             {%endifequal%}
                         {%endifequal%}
                     </ul>