--- a/src/iconolab/models.py Tue Jun 19 17:56:58 2018 +0200
+++ b/src/iconolab/models.py Fri Jun 22 11:33:17 2018 +0200
@@ -1,16 +1,13 @@
import json
import logging
import re
-import urllib
import uuid
import requests
from django.conf import settings
from django.contrib.auth.models import User
from django.contrib.contenttypes.fields import GenericRelation
-from django.contrib.contenttypes.models import ContentType
-from django.db import connection, models, transaction
-from django.db.models import Count
+from django.db import models, transaction
from django.utils.functional import cached_property
from django.utils.text import slugify
from django_comments_xtd.models import XtdComment
@@ -61,7 +58,7 @@
def completed_percent(self):
items_with_annotation = \
- ImageStats.objects.filter(image__item__collection = self, annotations_count__gt=0)\
+ ImageStats.objects.filter(image__item__collection=self, annotations_count__gt=0)\
.values('image__item').distinct().count()
total_items = self.items_count
@@ -455,7 +452,7 @@
def latest_revision_for_user(self, user):
user_revisions = self.revisions.filter(creator=user)
if user_revisions.exists():
- return user_revisions.filter(creator=author).order_by("-created").first()
+ return user_revisions.order_by("-created").first()
return None
@transaction.atomic