Merge remote-tracking branch 'origin/production' into production

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

diff --git a/apps/catalogue/models/__init__.py b/apps/catalogue/models/__init__.py
index d9a11dd..d0015c7 100755 (executable)
--- a/apps/catalogue/models/__init__.py
+++ b/apps/catalogue/models/__init__.py
@@ -3,7 +3,19 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
+from catalogue.models.project import Project
 from catalogue.models.chunk import Chunk
-from catalogue.models.publish_log import BookPublishRecord, ChunkPublishRecord
+from catalogue.models.image import Image
+from catalogue.models.publish_log import (BookPublishRecord,
+    ChunkPublishRecord, ImagePublishRecord)
 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)