rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Use simple_error() from rattail, for showing some error messages

Browse source 
just trying to standardize a little
This commit is contained in:
Lance Edgar 2019-09-19 20:19:26 -05:00
parent a972fb7359
commit 0d2f6e060f
4 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tailbone/views/batch/core.py
View file

@ -44,7 +44,7 @@ from sqlalchemy import orm
from rattail.db import model, Session as RattailSession
from rattail.db.util import short_session
from rattail.threads import Thread
from rattail.util import load_object, prettify
from rattail.util import load_object, prettify, simple_error
from rattail.progress import SocketProgress
import colander
@ -1057,7 +1057,8 @@ class BatchMasterView(MasterView):
if progress:
progress.session.load()
progress.session['error'] = True
progress.session['error_msg'] = "Batch population failed: {} - {}".format(error.__class__.__name__, error)
progress.session['error_msg'] = "Batch population failed: {}".format(
simple_error(error))
progress.session.save()
return
@ -1113,7 +1114,8 @@ class BatchMasterView(MasterView):
if progress:
progress.session.load()
progress.session['error'] = True
progress.session['error_msg'] = "Data refresh failed: {} {}".format(error.__class__.__name__, error)
progress.session['error_msg'] = "Data refresh failed: {}".format(
simple_error(error))
progress.session.save()
return
@ -1262,7 +1264,7 @@ class BatchMasterView(MasterView):
}, mobile=True)
def execute_error_message(self, error):
return "Batch execution failed: {}: {}".format(type(error).__name__, error)
return "Batch execution failed: {}".format(simple_error(error))
def execute_thread(self, batch_uuid, user_uuid, progress, **kwargs):
"""