Merge pull request #135 from Gluejar/list_by_a_publisher

publisher name can now have a "/" in it. (changed URLs)
pull/1/head
Raymond Yee 2013-03-06 10:22:32 -08:00
commit 14174ecb17
2 changed files with 4 additions and 4 deletions

View File

@ -23,9 +23,9 @@
{% if pubname %} {% if pubname %}
<li>{{ pubname }}... <li>{{ pubname }}...
<ul class="menu level3"> <ul class="menu level3">
<li class="first"><a href="{% url bypub_list pubname 'popular' %}"><span>Most popular</span></a></li> <li class="first"><a href="{% url bypub_list 'popular' pubname %}"><span>Most popular</span></a></li>
<li><a href="{% url bypub_list pubname %}"><span>By Title</span></a></li> <li><a href="{% url bypub_list pubname %}"><span>By Title</span></a></li>
<li><a href="{% url bypub_list pubname 'pubdate' %}"><span>By Date Published</span></a></li> <li><a href="{% url bypub_list 'pubdate' pubname %}"><span>By Date Published</span></a></li>
</ul> </ul>
</li> </li>
{% endif %} {% endif %}

View File

@ -37,8 +37,8 @@ urlpatterns = patterns(
url(r"^wishlist/$", "wishlist", name="wishlist"), url(r"^wishlist/$", "wishlist", name="wishlist"),
url(r"^campaigns/(?P<facet>\w*)$", CampaignListView.as_view(), name='campaign_list'), url(r"^campaigns/(?P<facet>\w*)$", CampaignListView.as_view(), name='campaign_list'),
url(r"^lists/(?P<facet>\w*)$", WorkListView.as_view(), name='work_list'), url(r"^lists/(?P<facet>\w*)$", WorkListView.as_view(), name='work_list'),
url(r"^bypub/(?P<pubname>[^/]*)/(?P<facet>\w*)$", ByPubListView.as_view(), name='bypub_list'), url(r"^bypub/all/(?P<pubname>.*)$", ByPubListView.as_view(), name='bypub_list'),
url(r"^bypub/(?P<pubname>[^/]*)$", ByPubListView.as_view(), name='bypub_list'), url(r"^bypub/(?P<facet>\w*)/(?P<pubname>.*)$", ByPubListView.as_view(), name='bypub_list'),
url(r"^unglued/(?P<facet>\w*)$", UngluedListView.as_view(), name='unglued_list'), url(r"^unglued/(?P<facet>\w*)$", UngluedListView.as_view(), name='unglued_list'),
url(r"^goodreads/auth/$", "goodreads_auth", name="goodreads_auth"), url(r"^goodreads/auth/$", "goodreads_auth", name="goodreads_auth"),
url(r"^goodreads/auth_cb/$", "goodreads_cb", name="goodreads_cb"), url(r"^goodreads/auth_cb/$", "goodreads_cb", name="goodreads_cb"),