X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fema.git;a=blobdiff_plain;f=urls.py;h=89b385611e75d5342622fda8a25fca9b34b902a0;hp=b625832495b80c7ce4eadb70e3fccb9ab50f7e44;hb=HEAD;hpb=0bfd3d45128b45b47310c3825e85f9fddec9e349

diff --git a/urls.py b/urls.py
index b625832..89b3856 100644
--- a/urls.py
+++ b/urls.py
@@ -19,9 +19,13 @@ 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
 
+from django.contrib import admin
+admin.autodiscover()
+
+
 MEDIA = {'document_root': settings.INSTANCE('media')}
 
 # the only difference between info_dict and info_dict_full is that the
@@ -29,8 +33,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()},
 }
@@ -42,7 +48,7 @@ info_dict_full = {
 }
 
 urlpatterns = patterns('',
-    (r'^admin/', include('django.contrib.admin.urls')),
+    (r'^admin/(.*)', admin.site.root),
 
     url(regex='^$',
         view='django.views.generic.list_detail.object_list',
@@ -55,8 +61,8 @@ urlpatterns = patterns('',
                     date_field='pub_date'),
         name='diario-entry'),
 
-    (r'^([-\w]+)/$', get_entry_by_slug),
     (r'^', include('ema.eventos.urls')),
+    (r'^([-\w]+)/$', get_entry_by_slug),
 
     # static media
     (r'^(?P<path>imgs/.*)$', 'django.views.static.serve', MEDIA),