revision for viewable radio

diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index 8dfe9c52c9722d752d6cbef87ab55d26987004df..6c41fc2a786001fda8403a120a1f140b0e65c278 100644 (file)
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -103,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', 'online and public'), ('3', 'online and private (account required)'))
+    viewable_choice = (('1', 'no preference'), ('2', 'online and public'), ('3', 'online (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 6ce50f754da7106957a42835beeb5ee4bb1ebce7..570f5e20c4aad6773ca275a8a3454ce57e32b270 100644 (file)
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -112,16 +112,16 @@
                         {%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 "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>
+                            <li><label for="id_viewable_2">{% trans "online (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 "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>
+                                <li><label for="id_viewable_2">{% trans "online (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 "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>
+                                <li><label for="id_viewable_2">{% trans "online (account required)" %} </label><input id="id_viewable_2" type="radio" value="3" name="viewable"></input></li>
                             {%endifequal%}
                         {%endifequal%}
                     </ul>