[Erp5-report] r40468 jerome - in /erp5/trunk/products/ERP5: PropertySheet/ bootstrap/erp5_c...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Nov 22 15:07:13 CET 2010


Author: jerome
Date: Mon Nov 22 15:07:12 2010
New Revision: 40468

URL: http://svn.erp5.org?rev=40468&view=rev
Log:
make timeout to oood configurable

Added:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml
Modified:
    erp5/trunk/products/ERP5/PropertySheet/DocumentPreference.py
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/PropertySheet/DocumentPreference.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/DocumentPreference.py?rev=40468&r1=40467&r2=40468&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/DocumentPreference.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/DocumentPreference.py [utf8] Mon Nov 22 15:07:12 2010
@@ -46,6 +46,13 @@ class DocumentPreference:
       'preference'  : 1,
       'write_permission': Permissions.ManageProperties,
       'mode'        : '' },
+    { 'id'          : 'preferred_ooodoc_server_timeout',
+      'description' : 'Timeout when connecting to the document conversion'
+                      ' server (in seconds)',
+      'type'        : 'int',
+      'preference'  : 1,
+      'write_permission': Permissions.ManageProperties,
+      'mode'        : '' },
     { 'id'          : 'preferred_document_reference_regular_expression',
       'description' : 'A regular expression to find and verify doc references',
       'type'        : 'string',

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml?rev=40468&r1=40467&r2=40468&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view.xml [utf8] Mon Nov 22 15:07:12 2010
@@ -86,6 +86,7 @@
                         <string>my_preferred_time_zone</string>
                         <string>my_preferred_ooodoc_server_address</string>
                         <string>my_preferred_ooodoc_server_port_number</string>
+                        <string>my_preferred_ooodoc_server_timeout</string>
                         <string>my_preferred_hide_rows_on_no_search_criterion</string>
                         <string>my_translated_preference_state_title</string>
                       </list>

Added: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml?rev=40468&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SystemPreference_view/my_preferred_ooodoc_server_timeout.xml [utf8] Mon Nov 22 15:07:12 2010
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list>
+                <string>title</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_preferred_ooodoc_server_timeout</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_integer_value</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Conversion Server Timeout</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=40468&r1=40467&r2=40468&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Mon Nov 22 15:07:12 2010
@@ -1 +1 @@
-1790
\ No newline at end of file
+1791
\ No newline at end of file




More information about the Erp5-report mailing list