projects
/
cascardo
/
ema.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing a ridiculous bug =/
[cascardo/ema.git]
/
urls.py
diff --git
a/urls.py
b/urls.py
index
22476cb
..
3a46f2d
100644
(file)
--- 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 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')}
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()]
# without menus.
hasmenu = [x.entry.id for x in Menu.objects.all()]
+inindex = [x.entry.id for x in Index.objects.all()]
+
info_dict = {
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()},
}
'template_object_name': 'entry',
'extra_context': {'menus': Menu.objects.all()},
}
@@
-54,6
+57,7
@@
urlpatterns = patterns('',
date_field='pub_date'),
name='diario-entry'),
date_field='pub_date'),
name='diario-entry'),
+ (r'^([-\w]+)/$', get_entry_by_slug),
(r'^', include('ema.eventos.urls')),
# static media
(r'^', include('ema.eventos.urls')),
# static media