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.

Sign up for GitHub

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

AN-145 initialise batch title field empty #2298

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

AN-145 initialise batch title field empty #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72c9265
AN-145: Set Initial value of Batch Title to empty string
Lunga001 Nov 9, 2017
a31ef3a
Changelog
Lunga001 Nov 9, 2017
7a9ba43
Using isIDAutoGenerated from plone_utils when setting initial value of
Lunga001 Dec 9, 2017
f602b04
Merge branch 'master' into AN-145-initialise-Batch-title-field-empty
Lunga001 Dec 9, 2017
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
6 changes: 5 additions & 1 deletion bika/lims/content/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,13 @@ def _renameAfterCreation(self, check_auto_id=False):
def Title(self):
""" Return the Batch ID if title is not defined """
titlefield = self.Schema().getField('title')
if titlefield.widget.visible:
titlevalue = titlefield.get(self)
if titlefield.widget.visible and titlevalue:
return safe_unicode(self.title).encode('utf-8')
else:
pu = api.portal.get_tool("plone_utils")
if pu.isIDAutoGenerated(self.getId()):
return ''
return safe_unicode(self.id).encode('utf-8')

def _getCatalogTool(self):
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
3.4.0 (unreleased)
------------------

- AN-145: Set Initial value of Batch Title to empty string
- Issue-2320: AR Add: Copy of multiple ARs from different clients raises a Traceback in the background
- Issue-2317: AR Add fails if an Analysis Category was disabled
- Issue-2316: AR Add fails silently if e.g. the ID of the AR was already taken
Expand Down