Merge master into img-playground. Image support with new management features. Missing...

[redakcja.git] / apps / catalogue / models / __init__.py

diff --git a/apps/catalogue/models/__init__.py b/apps/catalogue/models/__init__.py
index d9a11dd..82e1c11 100755 (executable)
--- a/apps/catalogue/models/__init__.py
+++ b/apps/catalogue/models/__init__.py
@@ -4,6 +4,16 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from catalogue.models.chunk import Chunk
+from catalogue.models.image import Image
 from catalogue.models.publish_log import BookPublishRecord, ChunkPublishRecord
 from catalogue.models.book import Book
 from catalogue.models.listeners import *
+
+from django.contrib.auth.models import User as AuthUser
+
+class User(AuthUser):
+    class Meta:
+        proxy = True
+
+    def __unicode__(self):
+        return "%s %s" % (self.first_name, self.last_name)