diff --git a/taiga/importers/jira/common.py b/taiga/importers/jira/common.py index 1448deeb..92d5a6df 100644 --- a/taiga/importers/jira/common.py +++ b/taiga/importers/jira/common.py @@ -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 = [] diff --git a/taiga/importers/jira/tasks.py b/taiga/importers/jira/tasks.py index 3be81380..01a4c30c 100644 --- a/taiga/importers/jira/tasks.py +++ b/taiga/importers/jira/tasks.py @@ -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: diff --git a/taiga/importers/trello/tasks.py b/taiga/importers/trello/tasks.py index f93f7441..770aecab 100644 --- a/taiga/importers/trello/tasks.py +++ b/taiga/importers/trello/tasks.py @@ -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: