Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix character encodings in analysisservice duplication #616

Merged
merged 3 commits into from
Feb 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Changelog

**Fixed**

- #616 Fix character encodings in analysisservice duplication
- #624 TypeError: "Can't pickle objects in acquisition wrappers" (WorksheetTemplate)
- #530 Calculated results do not get updated when importing instrument results
- #614 Fix accreditation category titles
Expand Down
20 changes: 10 additions & 10 deletions bika/lims/controlpanel/bika_analysisservices.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# Copyright 2018 by it's authors.
# Some rights reserved. See LICENSE.rst, CONTRIBUTORS.rst.

from transaction import savepoint

from Products.ATContentTypes.content.schemata import finalizeATCTSchema
from Products.Archetypes import atapi
from Products.CMFCore.utils import getToolByName
Expand All @@ -18,12 +16,12 @@
from bika.lims.config import PROJECTNAME
from bika.lims.idserver import renameAfterCreation
from bika.lims.interfaces import IAnalysisServices
from bika.lims.utils import t
from bika.lims.utils import tmpID
from bika.lims.validators import ServiceKeywordValidator
from plone.app.content.browser.interfaces import IFolderContentsView
from plone.app.folder.folder import ATFolder, ATFolderSchema
from plone.app.layout.globals.interfaces import IViewView
from transaction import savepoint
from zope.interface.declarations import implements


Expand Down Expand Up @@ -58,7 +56,7 @@ def validate_service(self, dst_service):
if res is not True:
self.savepoint.rollback()
self.created = []
self.context.plone_utils.addPortalMessage(res, 'info')
self.context.plone_utils.addPortalMessage(safe_unicode(res), 'info')
return False
return True

Expand Down Expand Up @@ -105,12 +103,14 @@ def __call__(self):
for i, s in enumerate(sources):
if not titles[i]:
message = _('Validation failed: title is required')
message = safe_unicode(message)
self.context.plone_utils.addPortalMessage(message, 'info')
self.savepoint.rollback()
self.created = []
break
if not keywords[i]:
message = _('Validation failed: keyword is required')
message = safe_unicode(message)
self.context.plone_utils.addPortalMessage(message, 'info')
self.savepoint.rollback()
self.created = []
Expand All @@ -119,13 +119,13 @@ def __call__(self):
if title:
self.created.append(title)
if len(self.created) > 1:
message = t(_(
'${items} were successfully created.',
mapping={'items': safe_unicode(', '.join(self.created))}))
message = _('${items} were successfully created.',
mapping={
'items': safe_unicode(', '.join(self.created))})
elif len(self.created) == 1:
message = t(_(
'${item} was successfully created.',
mapping={'item': safe_unicode(self.created[0])}))
message = _('${item} was successfully created.',
mapping={
'item': safe_unicode(self.created[0])})
else:
message = _('No new items were created.')
self.context.plone_utils.addPortalMessage(message, 'info')
Expand Down