From 59b1daa3752b97c3dbfc8320da5a4276d272568a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20G=C3=B3rny?= <bartek@gorny.edu.pl> Date: Tue, 26 Sep 2006 10:44:36 +0000 Subject: [PATCH] naming convention (#17) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10325 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_dms/DMS_createObjectFromMail.xml | 2 +- .../scripts/SetReferenceFromFilename.xml | 2 +- product/ERP5OOo/Document/DMSFile.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml index ffe6f2d50d..86e2fadbcd 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_createObjectFromMail.xml @@ -79,7 +79,7 @@ if ctype is None:\n # create content\n ob=context.document_module.newContent(portal_type=ctype,file=data)\n ob.setSourceReference(fname)\n -ob.setPropertiesFromFilename(fname)\n +ob.setPropertyListFromFilename(fname)\n ob.guessMimeType(fname)\n code,msg=ob.convert()\n if code>0:\n diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/dms_file_interaction_workflow/scripts/SetReferenceFromFilename.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/dms_file_interaction_workflow/scripts/SetReferenceFromFilename.xml index c0151a9e90..4d15e2fee4 100644 --- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/dms_file_interaction_workflow/scripts/SetReferenceFromFilename.xml +++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/dms_file_interaction_workflow/scripts/SetReferenceFromFilename.xml @@ -76,7 +76,7 @@ ob.log(script.getId(),ob.getRelativeUrl())\n if f is not None and f:\n # if file uploaded, then:\n fname=f.filename\n - ob.setPropertiesFromFilename(fname)\n + ob.setPropertyListFromFilename(fname)\n ob.setSourceReference(fname)\n if not ob.getTitle():\n ob.setTitle(fname)\n diff --git a/product/ERP5OOo/Document/DMSFile.py b/product/ERP5OOo/Document/DMSFile.py index bb439ffb0b..3093e477ca 100644 --- a/product/ERP5OOo/Document/DMSFile.py +++ b/product/ERP5OOo/Document/DMSFile.py @@ -197,8 +197,8 @@ class DMSFile(XMLObject,File): self.content_type=content_type return content_type - security.declareProtected(Permissions.ModifyPortalContent, 'setPropertiesFromFilename') - def setPropertiesFromFilename(self,fname): + security.declareProtected(Permissions.ModifyPortalContent, 'setPropertyListFromFilename') + def setPropertyListFromFilename(self,fname): rx_parse=re.compile(self.portal_preferences.getPreferredDmsFilenameRegexp()) if rx_parse is None: self.setReference(fname) -- 2.30.9