From 4825ed8418563b1bf04db1e74a278e53ad1129d5 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Wed, 12 May 2010 17:20:26 +0000 Subject: [PATCH] Document_convert is useless IDownloadable API do the job Document_getStandardFileName and Document_checkConversionFormatPermission has moved into erp5_base git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35259 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...cument_checkConversionFormatPermission.xml | 159 ---------------- .../erp5_ingestion/Document_convert.xml | 172 ------------------ .../Document_getStandardFileName.xml | 139 -------------- bt5/erp5_ingestion/bt/revision | 2 +- 4 files changed, 1 insertion(+), 471 deletions(-) delete mode 100644 bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_checkConversionFormatPermission.xml delete mode 100644 bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml delete mode 100644 bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getStandardFileName.xml diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_checkConversionFormatPermission.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_checkConversionFormatPermission.xml deleted file mode 100644 index bfe22863c2..0000000000 --- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_checkConversionFormatPermission.xml +++ /dev/null @@ -1,159 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>"""\n -This script provides a facility to permit conversion by format.\n -"""\n -#\n -# By default, all formats are permitted.\n -#\n -return 1\n -\n -\n -###\n -### Below is an example which pure auditors can only view in non editable\n -### formats (pdf, html, txt, png, etc.)\n -###\n -## from AccessControl import getSecurityManager\n -## user = getSecurityManager().getUser()\n -## role_list = user.getRolesInContext(context)\n -## \n -## # Users involved in the document may view it in editable mode\n -## if "Associate" in role_list or "Assignee" in role_list or\\\n -## "Assignor" in role_list or "Manager" in role_list or "Owner" in role_list:\n -## return 1\n -##\n -## # Reject original format\n -## if format is None:\n -## return 0\n -##\n -## # All users with view permission may view the document \n -## # in read only mode\n -## if format in (\'html\', \'stripped-html\', \'text\', \'txt\', \'pdf\', \'png\', \'jpg\', \'gif\'):\n -## return 1\n -## if format.endswith(\'pdf\'):\n -## return 1\n -## if format.endswith(\'html\'):\n -## return 1\n -##\n -## # All other formats are prohibitted\n -## return 0\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>format=None</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>format</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <tuple> - <none/> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Document_checkConversionFormatPermission</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml deleted file mode 100644 index 47601d50fb..0000000000 --- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>"""\n -Public interface to convert API method - sets additional headers and returns\n -output (a file in desired format).\n -"""\n -\n -request = context.REQUEST\n -response = request.RESPONSE\n -\n -from zExceptions import Unauthorized\n -\n -try:\n - data = context.index_html(request, response, format=format, force=force)\n -except Unauthorized:\n - msg = context.Base_translateString("You do not have enough permission for converting this document.")\n - return context.Base_redirect(keep_items=dict(portal_status_message=msg))\n -\n -typ = response.headers.get(\'content-type\')\n -\n -if not filename:\n - filename = context.getSourceReference()\n - if filename and \'.\' in filename:\n - filename = filename[:filename.rindex(\'.\')]\n - else:\n - filename = context.title_or_id()\n -filename = \'%s.%s\' % ((filename, format))\n -if typ == \'application/zip\':\n - filename += \'.zip\'\n -\n -request.RESPONSE.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % filename)\n -return data\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>filename=None, format=None, force=0</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>filename</string> - <string>format</string> - <string>force</string> - <string>_getattr_</string> - <string>context</string> - <string>request</string> - <string>response</string> - <string>zExceptions</string> - <string>Unauthorized</string> - <string>data</string> - <string>msg</string> - <string>dict</string> - <string>typ</string> - <string>_getitem_</string> - <string>_inplacevar_</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <tuple> - <none/> - <none/> - <int>0</int> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Document_convert</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Convert document to given format</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getStandardFileName.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getStandardFileName.xml deleted file mode 100644 index 2659fad6f2..0000000000 --- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getStandardFileName.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>"""\n - This script returns a standard file name, build from reference, version and\n - language (this is only the base part of the name, the extension should be appended\n - in another place). It does the reverse of getPropertyDictFromFileName, so changes in\n - filename parsing regular expression should be reflected here.\n - It is used as a type-based method.\n -"""\n -\n -if context.getReference():\n - file_name = context.getReference()\n -else:\n - file_name = context.getTitleOrId()\n -if context.getVersion():\n - file_name = file_name + \'-%s\' % context.getVersion()\n -if context.getLanguage():\n - file_name = file_name + \'-%s\' % context.getLanguage()\n -return file_name\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>_getattr_</string> - <string>context</string> - <string>file_name</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Document_getStandardFileName</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision index 0fa6a7b088..a46c9d2265 100644 --- a/bt5/erp5_ingestion/bt/revision +++ b/bt5/erp5_ingestion/bt/revision @@ -1 +1 @@ -90 \ No newline at end of file +91 \ No newline at end of file -- 2.30.9