Skip to content

Commit

Permalink
Corrected Import scripts results display in BO
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Chjakiachvili committed Feb 5, 2018
1 parent 0596391 commit d1a09f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Version 1.1.7 - 2018-02-07
--------------------------

- [Updated] - shared logging behaviour in Jobs / Importer

- [Corrected] - service import method

Version 1.1.6 - 2018-01-31
--------------------------
Expand Down
4 changes: 2 additions & 2 deletions waves/wcore/admin/views/runner_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ def post(self, request, *args, **kwargs):
if len(importer.warnings) == 0 and len(importer.errors) == 0:
messages.add_message(self.request, level=messages.SUCCESS, message='All parameters imported :-)')
messages.add_message(self.request, level=messages.INFO,
message="Import log in %s" % importer.log_file(tool_id))
message="Import log in %s" % importer.log_file)
return JsonResponse(data, status=200)
except Exception as e:
data = {'url_redirect': runner.get_admin_url()}
messages.add_message(self.request, level=messages.ERROR,
message=mark_safe("Import failed :-( :<pre>%s</pre>" % e.message))
messages.add_message(self.request, level=messages.INFO,
message="Import log in %s" % importer.log_file(tool_id))
message="Import log in %s" % importer.log_file)
return JsonResponse(data, status=200)


Expand Down

0 comments on commit d1a09f2

Please sign in to comment.