Skip to content

Commit

Permalink
puliendo eventos
Browse files Browse the repository at this point in the history
  • Loading branch information
fitoria committed Jan 5, 2009
1 parent d27cb0a commit aa2c36e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion softwarelibre/apps/events/models.py
Expand Up @@ -94,7 +94,7 @@ def __unicode__(self):

# @models.permalink
def get_absolute_url(self):
return u'/eventos/%s/' % self.id
return u'/evento/%s/' % self.id

def has_passed(self):
if self.end:
Expand Down
8 changes: 4 additions & 4 deletions softwarelibre/apps/events/urls.py
@@ -1,13 +1,13 @@
from django.conf.urls.defaults import *
from events.models import Event
from models import Event

event_dict = {
'queryset': Event.on_site.all(),
'template_object_name': 'event'
}

urlpatterns = patterns('django.views.generic',
url(r'^event-(?P<object_id>\d+)/$', 'list_detail.object_detail', event_dict, name="event-detail"),
url(r'^(?P<year>\d{4})/$','date_based.archive_year', dict(event_dict, allow_future=True, date_field='start', allow_empty=True, make_object_list=True)),
url(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$','date_based.archive_month', dict(event_dict, allow_future=True, date_field='start', allow_empty=True)),
url(r'^(?P<object_id>\d+)/$', 'list_detail.object_detail', event_dict, name="event-detail"),
url(r'^archivo/(?P<year>\d{4})/$','date_based.archive_year', dict(event_dict, allow_future=True, date_field='start', allow_empty=True, make_object_list=True)),
url(r'^archivo/(?P<year>\d{4})/(?P<month>[a-z]{3})/$','date_based.archive_month', dict(event_dict, allow_future=True, date_field='start', allow_empty=True)),
)
Binary file modified softwarelibre/development.sqlite
Binary file not shown.
1 change: 1 addition & 0 deletions softwarelibre/urls.py
Expand Up @@ -25,6 +25,7 @@
(r'^admin/(.*)', admin.site.root),
(r'^cuentas/', include('apps.registration.urls')),
(r'^planeta/', include('apps.planet.urls')),
(r'^evento/', include('apps.events.urls')),
(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
#(r'^feeds/(p<url>.*)/(p<category>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(r'^archivos/(.*)$', 'django.views.static.serve', {'document_root': os_path.join(settings.MEDIA_ROOT, '..', 'media')}),
Expand Down

0 comments on commit aa2c36e

Please sign in to comment.