Fixes on jira importer async version

remotes/origin/issue/4217/improving-mail-design
Jesús Espino 2017-02-28 08:02:00 +01:00
parent 0244a39475
commit 6bdbf7c106
3 changed files with 11 additions and 6 deletions

View File

@ -155,12 +155,16 @@ class JiraImporterCommon:
self._client = JiraClient(server=server, oauth=oauth)
def resolve_user_bindings(self, options):
for option in list(options['users_bindings'].keys()):
def resolve_user(user_id):
if isinstance(user_id, User):
return user_id
try:
user = User.objects.get(id=options['users_bindings'][option])
options['users_bindings'][option] = user
user = User.objects.get(id=user_id)
return user
except User.DoesNotExist:
del(options['users_bindings'][option])
return None
options['users_bindings'] = {k: resolve_user(v) for k,v in options['users_bindings'].items() if v is not None}
def list_users(self):
result = []

View File

@ -25,6 +25,7 @@ from taiga.base.mails import mail_builder
from taiga.users.models import User
from taiga.celery import app
from .normal import JiraNormalImporter
from .agile import JiraAgileImporter
logger = logging.getLogger('taiga.importers.jira')
@ -49,7 +50,7 @@ def import_project(self, user_id, url, token, project_id, options, importer_type
"project": project_id,
"exception": e
}
email = mail_builder.importer_import_error(admin, ctx)
email = mail_builder.importer_import_error(user, ctx)
email.send()
logger.error('Error importing Jira project %s (by %s)', project_id, user, exc_info=sys.exc_info())
else:

View File

@ -44,7 +44,7 @@ def import_project(self, user_id, token, project_id, options):
"project": project_id,
"exception": e
}
email = mail_builder.importer_import_error(admin, ctx)
email = mail_builder.importer_import_error(user, ctx)
email.send()
logger.error('Error importing Trello project %s (by %s)', project_id, user, exc_info=sys.exc_info())
else: