X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fema.git;a=blobdiff_plain;f=urls.py;h=3a46f2d0382e99ee6a8661240ba03d4353a17d2c;hp=22476cb9035d5c2a1b2cfabddae9c3fcfa10cafb;hb=3245747f4c68a8b7dbd366702f51d4910a597be0;hpb=00df5d23c35aa1b4bdf9de11622a9530252668fd diff --git a/urls.py b/urls.py index 22476cb..3a46f2d 100644 --- a/urls.py +++ b/urls.py @@ -19,7 +19,8 @@ from django.conf.urls.defaults import * from django.conf import settings from diario.settings import DIARIO_NUM_LATEST from diario.models import Entry -from contents.models import Menu +from contents.models import Menu, Index +from ema.views import get_entry_by_slug MEDIA = {'document_root': settings.INSTANCE('media')} @@ -28,8 +29,10 @@ MEDIA = {'document_root': settings.INSTANCE('media')} # without menus. hasmenu = [x.entry.id for x in Menu.objects.all()] +inindex = [x.entry.id for x in Index.objects.all()] + info_dict = { - 'queryset': Entry.published_on_site.exclude(id__in=hasmenu), + 'queryset': Entry.published_on_site.exclude(id__in=hasmenu).filter(id__in=inindex), 'template_object_name': 'entry', 'extra_context': {'menus': Menu.objects.all()}, } @@ -54,6 +57,7 @@ urlpatterns = patterns('', date_field='pub_date'), name='diario-entry'), + (r'^([-\w]+)/$', get_entry_by_slug), (r'^', include('ema.eventos.urls')), # static media