taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing compatibility with python 3.4

remotes/origin/issue/4217/improving-mail-design
Jesús Espino 2017-03-23 10:36:51 +01:00
parent db971f7c79
commit 282f5de56a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taiga/projects/services/bulk_update_order.py
View File

@ -19,8 +19,6 @@
from django.db import transaction, connection from django.db import transaction, connection
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from taiga.projects import models
from contextlib import suppress 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) apply_order_updates(memberships_orders, new_memberships_orders)
from taiga.base.utils import db from taiga.base.utils import db
from taiga.projects import models
db.update_attr_in_bulk_for_ids(memberships_orders, field, model=models.Membership) db.update_attr_in_bulk_for_ids(memberships_orders, field, model=models.Membership)

5
taiga/projects/services/members.py
View File

@ -24,8 +24,6 @@ from django.conf import settings
from django.core.validators import validate_email from django.core.validators import validate_email
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from .. import models
def get_members_from_bulk(bulk_data, **additional_fields): def get_members_from_bulk(bulk_data, **additional_fields):
"""Convert `bulk_data` into a list of members. """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["user_id"] = user.id
data_copy.update(additional_fields) data_copy.update(additional_fields)
from .. import models
members.append(models.Membership(**data_copy)) members.append(models.Membership(**data_copy))
return members 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): def remove_user_from_project(user, project):
from .. import models
models.Membership.objects.get(project=project, user=user).delete() models.Membership.objects.get(project=project, user=user).delete()

2
taiga/projects/services/modules_config.py
View File

@ -18,11 +18,11 @@
import importlib import importlib
from .. import models
from django.conf import settings from django.conf import settings
def get_modules_config(project): def get_modules_config(project):
from .. import models
modules_config, created = models.ProjectModulesConfig.objects.get_or_create(project=project) modules_config, created = models.ProjectModulesConfig.objects.get_or_create(project=project)
if created or modules_config.config == None: if created or modules_config.config == None: