From: Radek Czajka Date: Fri, 25 Mar 2011 11:33:20 +0000 (+0100) Subject: Merge commit '645219bfa68384dad930269b94e2ddf8b4cd3488' into api X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/5207c4d8ee23d6d5df532faa8103a34b1572e45f?hp=-c Merge commit '645219bfa68384dad930269b94e2ddf8b4cd3488' into api --- 5207c4d8ee23d6d5df532faa8103a34b1572e45f diff --combined apps/catalogue/models.py index ef923fa08,455296217..34c1d0b23 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@@ -64,9 -64,6 +64,9 @@@ class Tag(TagBase) gazeta_link = models.CharField(blank=True, max_length=240) wiki_link = models.CharField(blank=True, max_length=240) + created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True) + changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True) + categories_rev = { 'autor': 'author', 'epoka': 'epoch', @@@ -223,8 -220,7 +223,8 @@@ class Book(models.Model) title = models.CharField(_('title'), max_length=120) slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) description = models.TextField(_('description'), blank=True) - created_at = models.DateTimeField(_('creation date'), auto_now_add=True) + created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True) + changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True) _short_html = models.TextField(_('short HTML'), editable=False) parent_number = models.IntegerField(_('parent number'), default=0) extra_info = JSONField(_('extra information')) @@@ -562,7 -558,7 +562,7 @@@ tag.save() book_tags.append(tag) - book.tags = book_tags + book_shelves + book.tags = set(book_tags + book_shelves) book_tag = book.book_tag() diff --combined wolnelektury/urls.py index 0d61a3611,a99030f4d..932c440f6 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@@ -25,6 -25,7 +25,7 @@@ urlpatterns = patterns('' url(r'^o-projekcie/$', 'infopages.views.infopage', {'slug': 'about_us'}, name='about_us'), url(r'^widget/$', 'infopages.views.infopage', {'slug': 'widget'}, name='widget'), url(r'^epub/$', 'infopages.views.infopage', {'slug': 'epub'}, name='epub'), + url(r'^zaproszenie/$', 'infopages.views.infopage', {'slug': 'invitation'}, name='invitation'), url(r'^1procent/$', 'django.views.generic.simple.direct_to_template', { 'template': '1percent.html' @@@ -36,7 -37,6 +37,7 @@@ url(r'^admin/', include(admin.site.urls)), # Authentication + url(r'^users/simple_login/$', 'catalogue.views.simple_login', name='simple_login'), url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'), url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'), url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),