[Erp5-report] r10409 - /erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/

[nobody at svn.erp5.org]

Author: bartek
Date: Thu Sep 28 16:48:10 2006
New Revision: 10409

URL: http://svn.erp5.org?rev=10409&view=rev
Log:
bugfixes

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromFile.xml
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_notifyByEmail.xml

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromFile.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromFile.xml?rev=10409&r1=10408&r2=10409&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromFile.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromFile.xml Thu Sep 28 16:48:10 2006
@@ -76,7 +76,7 @@
 \n
 # create content\n
 ob=context.document_module.newContent(portal_type=ctype)\n
-ob.Base_edit(file=data) # XXX to nie jest dobrze\n
+ob.manage_upload(data)\n
 ob.DMS_ingestFile(fname,data)\n
 return ob\n
 </string> </value>

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_notifyByEmail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_notifyByEmail.xml?rev=10409&r1=10408&r2=10409&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_notifyByEmail.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_notifyByEmail.xml Thu Sep 28 16:48:10 2006
@@ -69,9 +69,9 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>pref=context.portal_preferences.getPreferredDmsIngestEmailNotification()\n
-if len(pref)==0:return\n
-pref=pref[0]\n
-if pref==\'never\':return\n
+if pref is not None and len(pref)==0:\n
+  pref=pref[0]\n
+  if pref==\'never\':return\n
 \n
 subjecttpl=\'ingested %(name)s\'\n
 msgtpl="""Your document "%(name)s" was successfully ingested.\n
@@ -79,8 +79,8 @@
 click here: %(url)s/view to proceed with your work.\n
 """\n
 ob=kw[\'object\']\n
-subject=subjecttpl % {\'name\':ob.getOriginalFilename()}\n
-msg=msgtpl % {\'url\':ob.absolute_url(),\'name\':ob.getOriginalFilename()}\n
+subject=subjecttpl % {\'name\':ob.getSourceReference()}\n
+msg=msgtpl % {\'url\':ob.absolute_url(),\'name\':ob.getSourceReference()}\n
 mto=kw[\'address\']\n
 mfro=\'dms at dms.nexedi.com\'\n
 \n
@@ -131,6 +131,7 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>pref</string>
+                            <string>None</string>
                             <string>len</string>
                             <string>_getitem_</string>
                             <string>subjecttpl</string>