Merge branch 'master' into production

[wolnelektury.git] / apps / libraries / models.py

diff --git a/apps/libraries/models.py b/apps/libraries/models.py
index 9856608..5f92421 100644 (file)
--- a/apps/libraries/models.py
+++ b/apps/libraries/models.py
@@ -15,11 +15,16 @@ class Catalog(models.Model):
     def __unicode__(self):\r
         return self.name\r
         \r
-    \r
+    @models.permalink\r
+    def get_absolute_url(self):\r
+        return ('libraries_catalog_view', [self.slug])\r
+        \r
+        \r
 class Library(models.Model):\r
     """Represent a single library in the libraries dictionary"""\r
 \r
     name = models.CharField(_('name'), max_length = 120, blank = True)
+    slug = models.SlugField(_('slug'), max_length = 120, unique = True, db_index = True, null = True)
     catalog = models.ForeignKey(Catalog, null = False, related_name = 'libraries', on_delete = models.PROTECT)\r
     url = models.CharField(_('url'), max_length = 120, blank = True)
     description = models.TextField(_('description'), blank = True)\r
@@ -33,4 +38,4 @@ class Library(models.Model):
 \r
     @models.permalink\r
     def get_absolute_url(self):\r
-        return ('infopage', [self.slug])\r
+        return ('libraries_library_view', [self.catalog.slug, self.slug])
\ No newline at end of file