Fixing compatibility with python 3.4
parent
db971f7c79
commit
282f5de56a
|
@ -19,8 +19,6 @@
|
|||
from django.db import transaction, connection
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
|
||||
from taiga.projects import models
|
||||
|
||||
from contextlib import suppress
|
||||
|
||||
|
||||
|
@ -88,6 +86,7 @@ def update_projects_order_in_bulk(bulk_data: list, field: str, user):
|
|||
apply_order_updates(memberships_orders, new_memberships_orders)
|
||||
|
||||
from taiga.base.utils import db
|
||||
from taiga.projects import models
|
||||
db.update_attr_in_bulk_for_ids(memberships_orders, field, model=models.Membership)
|
||||
|
||||
|
||||
|
|
|
@ -24,8 +24,6 @@ from django.conf import settings
|
|||
from django.core.validators import validate_email
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from .. import models
|
||||
|
||||
|
||||
def get_members_from_bulk(bulk_data, **additional_fields):
|
||||
"""Convert `bulk_data` into a list of members.
|
||||
|
@ -48,6 +46,8 @@ def get_members_from_bulk(bulk_data, **additional_fields):
|
|||
data_copy["user_id"] = user.id
|
||||
|
||||
data_copy.update(additional_fields)
|
||||
|
||||
from .. import models
|
||||
members.append(models.Membership(**data_copy))
|
||||
return members
|
||||
|
||||
|
@ -67,6 +67,7 @@ def create_members_in_bulk(bulk_data, callback=None, precall=None, **additional_
|
|||
|
||||
|
||||
def remove_user_from_project(user, project):
|
||||
from .. import models
|
||||
models.Membership.objects.get(project=project, user=user).delete()
|
||||
|
||||
|
||||
|
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
import importlib
|
||||
|
||||
from .. import models
|
||||
from django.conf import settings
|
||||
|
||||
|
||||
def get_modules_config(project):
|
||||
from .. import models
|
||||
modules_config, created = models.ProjectModulesConfig.objects.get_or_create(project=project)
|
||||
|
||||
if created or modules_config.config == None:
|
||||
|
|
Loading…
Reference in New Issue