Simplify url list opened + remove regex code

diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index cb6e61f8c9a1ea11c2befb946c9c1b3982605505..b729cfd188d84f947f417302d1aa962aa5e4c184 100644 (file)
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -40,10 +40,10 @@ class HaySearchForm(FacetedSearchForm):
 
         if self.cleaned_data['q']:
             #search input of a code, contains at least '_YYYY_'
-            if not re.match('([a-zA-Z]*_?[EI])?_[0-9]{4}_([0-9]{3}_[0-9]{3})?', self.cleaned_data.get('q')):
-                sqs = sqs.filter(content__startswith=self.cleaned_data['q']).facet('item_acces').facet('item_status').facet('digitized').facet('recording_context').facet('physical_format').facet('media_type')
-            else:
-                sqs = sqs.filter(code__contains=self.cleaned_data['q']).facet('item_acces').facet('item_status').facet('digitized').facet('recording_context').facet('physical_format').facet('media_type')
+            #if not re.match('([a-zA-Z]*_?[EI])?_[0-9]{4}_([0-9]{3}_[0-9]{3})?', self.cleaned_data.get('q')):
+            sqs = sqs.filter(content__startswith=self.cleaned_data['q']).facet('item_acces').facet('item_status').facet('digitized').facet('recording_context').facet('physical_format').facet('media_type')
+            #else:
+            #    sqs = sqs.filter(code__contains=self.cleaned_data['q']).facet('item_acces').facet('item_status').facet('digitized').facet('recording_context').facet('physical_format').facet('media_type')
 
         for facet in self.selected_facets:
             if ":" not in facet:

diff --git a/telemeta/urls.py b/telemeta/urls.py
index c1e1908cacc63802ad5c6244ded78aa4fa27d459..3b01fc36d5b919ce12082cb306ed5ca4546e69dc 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -200,7 +200,7 @@ urlpatterns = patterns('',
     url(r'^accounts/$', home_view.users, name="telemeta-users"),
 
     # Desk
-    url(r'^desk/lists/(?:open-list-(?P<range_playlist>[0-9]+)/)?$', home_view.lists, name="telemeta-desk-lists"),
+    url(r'^desk/lists/(?:(?P<range_playlist>[0-9]+)/)?$', home_view.lists, name="telemeta-desk-lists"),
     url(r'^desk/profile/(?P<username>[A-Za-z0-9@+._-]+)/$', profile_view.profile_detail, name="telemeta-desk-profile"),
     url(r'^desk/home/$', home_view.home, name="telemeta-desk-home"),