From cc56858377cf2073f088177dafcee0fd727c8869 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 29 Jul 2018 20:28:46 +0000 Subject: [PATCH] import Group from user.models --- pandora/app/monkey_patch.py | 2 +- pandora/document/managers.py | 1 + pandora/document/models.py | 2 +- pandora/documentcollection/models.py | 2 +- pandora/edit/models.py | 2 +- pandora/item/managers.py | 2 +- pandora/item/models.py | 2 +- pandora/itemlist/models.py | 2 +- pandora/user/models.py | 10 +++++----- pandora/user/utils.py | 2 +- pandora/user/views.py | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pandora/app/monkey_patch.py b/pandora/app/monkey_patch.py index 8c2bead5..b106e224 100644 --- a/pandora/app/monkey_patch.py +++ b/pandora/app/monkey_patch.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import division, print_function, absolute_import -from django.contrib.auth.models import Group from django.contrib.auth import get_user_model +from django.contrib.auth.models import Group from django.core.validators import MaxLengthValidator diff --git a/pandora/document/managers.py b/pandora/document/managers.py index c4af8be6..5491aa1d 100644 --- a/pandora/document/managers.py +++ b/pandora/document/managers.py @@ -13,6 +13,7 @@ from oxdjango.managers import get_operator from documentcollection.models import Collection from item import utils +from user.models import Group keymap = { diff --git a/pandora/document/models.py b/pandora/document/models.py index fdf58874..1a824734 100644 --- a/pandora/document/models.py +++ b/pandora/document/models.py @@ -10,7 +10,6 @@ from six import PY2, string_types from six.moves.urllib.parse import quote, unquote from django.db import models, transaction from django.db.models import Q, Sum, Max -from django.contrib.auth.models import Group from django.contrib.auth import get_user_model from django.db.models.signals import pre_delete from django.conf import settings @@ -27,6 +26,7 @@ from item.models import Item from annotation.models import Annotation from archive.extract import resize_image from archive.chunk import save_chunk +from user.models import Group from . import managers from . import utils diff --git a/pandora/documentcollection/models.py b/pandora/documentcollection/models.py index 774ac8f7..014f6bec 100644 --- a/pandora/documentcollection/models.py +++ b/pandora/documentcollection/models.py @@ -8,7 +8,6 @@ from glob import glob from django.db import models from django.db.models import Max -from django.contrib.auth.models import Group from django.contrib.auth import get_user_model from django.conf import settings from django.utils.encoding import python_2_unicode_compatible @@ -18,6 +17,7 @@ import ox from archive import extract from user.utils import update_groups +from user.models import Group from . import managers diff --git a/pandora/edit/models.py b/pandora/edit/models.py index 39c4fc19..69b7bb37 100644 --- a/pandora/edit/models.py +++ b/pandora/edit/models.py @@ -13,7 +13,6 @@ import ox from django.conf import settings from django.db import models, transaction from django.db.models import Max -from django.contrib.auth.models import Group from django.contrib.auth import get_user_model from django.utils.encoding import python_2_unicode_compatible @@ -26,6 +25,7 @@ import clip.models from archive import extract from user.utils import update_groups +from user.models import Group from . import managers diff --git a/pandora/item/managers.py b/pandora/item/managers.py index a976719e..d1aa6d0e 100644 --- a/pandora/item/managers.py +++ b/pandora/item/managers.py @@ -10,7 +10,7 @@ from django.conf import settings from archive.models import Volume from itemlist.models import List -from django.contrib.auth.models import Group +from user.models import Group from . import utils from oxdjango.query import QuerySet diff --git a/pandora/item/models.py b/pandora/item/models.py index effd64f0..fe7ad08a 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -17,7 +17,6 @@ from six.moves.urllib.parse import quote from django.db import models, transaction, connection from django.db.models import Q, Sum, Max from django.conf import settings -from django.contrib.auth.models import Group from django.contrib.auth import get_user_model from django.db.models.signals import pre_delete @@ -43,6 +42,7 @@ from person.models import get_name_sort from sequence.tasks import get_sequences from title.models import get_title_sort from user.utils import update_groups +from user.models import Group import archive.models User = get_user_model() diff --git a/pandora/itemlist/models.py b/pandora/itemlist/models.py index 9af7fc4b..e9e877bb 100644 --- a/pandora/itemlist/models.py +++ b/pandora/itemlist/models.py @@ -8,7 +8,6 @@ from glob import glob from django.db import models from django.db.models import Max -from django.contrib.auth.models import Group from django.contrib.auth import get_user_model from django.conf import settings from django.utils.encoding import python_2_unicode_compatible @@ -18,6 +17,7 @@ import ox from archive import extract from user.utils import update_groups +from user.models import Group from . import managers diff --git a/pandora/user/models.py b/pandora/user/models.py index 683295c9..0c94beb7 100644 --- a/pandora/user/models.py +++ b/pandora/user/models.py @@ -15,11 +15,6 @@ from oxdjango.fields import JSONField import ox from ox.utils import json -from itemlist.models import List, Position -import text -import edit -import documentcollection.models - from . import managers from . import tasks from .utils import get_ip, get_location @@ -233,6 +228,11 @@ def profile_post_save(sender, instance, **kwargs): models.signals.post_save.connect(profile_post_save, sender=UserProfile) def get_ui(user_ui, user=None): + from itemlist.models import List, Position + import documentcollection.models + import edit.models + import text.models + ui = {} config = copy.deepcopy(settings.CONFIG) ui.update(config['user']['ui']) diff --git a/pandora/user/utils.py b/pandora/user/utils.py index 5e07ebb4..2cc82f1c 100644 --- a/pandora/user/utils.py +++ b/pandora/user/utils.py @@ -1,5 +1,4 @@ from django.contrib.gis.geoip2 import GeoIP2 -from django.contrib.auth.models import Group import ox @@ -73,6 +72,7 @@ def rename_user(u, new): u.save() def update_groups(model, groups): + from .models import Group if isinstance(groups, list): groups = list(filter(lambda g: g.strip(), groups)) groups = [ox.escape_html(g) for g in groups] diff --git a/pandora/user/views.py b/pandora/user/views.py index 406d24f5..d14b361d 100644 --- a/pandora/user/views.py +++ b/pandora/user/views.py @@ -13,7 +13,6 @@ from django.core.mail import send_mail, BadHeaderError, EmailMessage from django.shortcuts import redirect from django.db import transaction from django.db.models import Max -from django.contrib.auth.models import Group from django.contrib.auth import get_user_model from django.contrib.sessions.models import Session @@ -26,6 +25,7 @@ from oxdjango.api import actions from item.models import Access, Item from item import utils from changelog.models import add_changelog +from user.models import Group from . import models from .decorators import capability_required_json