entrouvert
/
collective.dms.mailcontent
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

validateIndexValueUniqueness: we skip empty value check

This commit is contained in:
Stephan Geulette 2013-04-11 14:45:59 +02:00
parent 46cf82a756
commit 331ac55afc
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/collective/dms/mailcontent/dmsmail.py
View File

@ -30,6 +30,9 @@ def validateIndexValueUniqueness(context, portal_type, index_name, value):
"""
check at 'portal_type' 'context' creation if 'index' 'value' is uniqueness
"""
# if the value is empty, we don't check anything
if not value:
return
catalog = getToolByName(context, 'portal_catalog')
brains = catalog.searchResults(**{index_name: value})
if context.portal_type != portal_type:

13
src/collective/dms/mailcontent/tests/test_content.py
View File

@ -45,7 +45,7 @@ class TestDmsmailMethods(TestContentTypes):
self.assertEquals(dmsmail.validateIndexValueUniqueness(imail1, 'dmsincomingmail',
'internal_reference_number', '12345'), None)
#test with object as context and a sub element in the folder, value exists on the same object
imail2 = createContentInContainer(imail1, 'dmsmainfile', **{'title': 'File 1'})
createContentInContainer(imail1, 'dmsmainfile', **{'title': 'File 1'})
self.assertEquals(dmsmail.validateIndexValueUniqueness(imail1, 'dmsincomingmail',
'internal_reference_number', '12345'), None)
#test with object as context, value exists on a different object too
@ -53,9 +53,16 @@ class TestDmsmailMethods(TestContentTypes):
**{'internal_reference_no': '12345', 'title': 'Test 2'})
self.assertRaisesRegexp(Invalid, u"This value is already used", dmsmail.validateIndexValueUniqueness,
*[imail2, 'dmsincomingmail', 'internal_reference_number', '12345'])
#test with empty value
imail3 = createContentInContainer(self.portal, 'dmsincomingmail',
**{'internal_reference_no': '', 'title': 'Test 2'})
self.assertEquals(dmsmail.validateIndexValueUniqueness(self.portal, 'dmsincomingmail',
'internal_reference_number', ''), None)
self.assertEquals(dmsmail.validateIndexValueUniqueness(imail3, 'dmsincomingmail',
'internal_reference_number', ''), None)
def test_evaluateInternalReference(self):
self.assertEquals(dmsmail.evaluateInternalReference(self.portal, self.portal.REQUEST,
'collective.dms.mailcontent.browser.settings.IDmsMailConfig.incomingmail_number',
'collective.dms.mailcontent.browser.settings.IDmsMailConfig.incomingmail_talexpression'),
'collective.dms.mailcontent.browser.settings.IDmsMailConfig.incomingmail_number',
'collective.dms.mailcontent.browser.settings.IDmsMailConfig.incomingmail_talexpression'),
'test-in/10')