Commit a03e7973 authored by Bartek Górny's avatar Bartek Górny

handle exception when a contributing user has no subordination

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11297 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 69425916
No related merge requests found
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
noSenderInHeaderMsg="no sender in headers"\n noSenderInHeaderMsg="no sender in headers"\n
noSenderMsg="you are not in user database"\n noSenderMsg="you are not in user database"\n
manySendersMsg="very serious error: your address has multiple entries"\n manySendersMsg="very serious error: your address has multiple entries"\n
noSubordinationMsg="you do not have properly set subordination (I could not find a group you are working in)"\n
\n \n
# get sender from headers\n # get sender from headers\n
fromraw=theMail[\'headers\'][\'from\']\n fromraw=theMail[\'headers\'][\'from\']\n
...@@ -92,6 +93,7 @@ if len(r)==0:\n ...@@ -92,6 +93,7 @@ if len(r)==0:\n
return printed\n return printed\n
if len(r)>1:\n if len(r)>1:\n
print manySendersMsg\n print manySendersMsg\n
return printed\n
senderm=r[0]\n senderm=r[0]\n
person=senderm.getParent()\n person=senderm.getParent()\n
context.log(script.getId(),\'ok, this address belongs to \'+person.getRelativeUrl())\n context.log(script.getId(),\'ok, this address belongs to \'+person.getRelativeUrl())\n
...@@ -108,7 +110,11 @@ try:\n ...@@ -108,7 +110,11 @@ try:\n
if k==\'programme\':atr=\'source_project\'\n if k==\'programme\':atr=\'source_project\'\n
if k!=\'document_type\':\n if k!=\'document_type\':\n
obj.setProperty(atr,mailprops[k])\n obj.setProperty(atr,mailprops[k])\n
try:\n
obj.setGroup(person.getSubordinationValue().getGroup())\n obj.setGroup(person.getSubordinationValue().getGroup())\n
except AttributeError:\n
print noSubordinationMsg\n
return printed\n
obj.manage_setLocalRoles(person.getReference(),[\'Owner\',])\n obj.manage_setLocalRoles(person.getReference(),[\'Owner\',])\n
context.DMS_notifyByEmail(address=senderemail,event=\'ingest\',object=obj)\n context.DMS_notifyByEmail(address=senderemail,event=\'ingest\',object=obj)\n
except Exception,e:\n except Exception,e:\n
...@@ -170,6 +176,7 @@ return\n ...@@ -170,6 +176,7 @@ return\n
<string>noSenderInHeaderMsg</string> <string>noSenderInHeaderMsg</string>
<string>noSenderMsg</string> <string>noSenderMsg</string>
<string>manySendersMsg</string> <string>manySendersMsg</string>
<string>noSubordinationMsg</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>fromraw</string> <string>fromraw</string>
<string>_getattr_</string> <string>_getattr_</string>
...@@ -188,6 +195,7 @@ return\n ...@@ -188,6 +195,7 @@ return\n
<string>obj</string> <string>obj</string>
<string>k</string> <string>k</string>
<string>atr</string> <string>atr</string>
<string>AttributeError</string>
<string>Exception</string> <string>Exception</string>
<string>e</string> <string>e</string>
<string>str</string> <string>str</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment