[Erp5-report] r43214 arnaud.fontaine - in /erp5/trunk/products: ERP5/bootstrap/ ERP5/bootst...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 9 09:58:06 CET 2011
Author: arnaud.fontaine
Date: Wed Feb 9 09:58:06 2011
New Revision: 43214
URL: http://svn.erp5.org?rev=43214&view=rev
Log:
Create a separate Document for Property Sheet and move methods from
Property Sheet Tool to this new document and update Property Sheet
Portal Type accordingly
Added:
erp5/trunk/products/ERP5Type/Core/PropertySheet.py
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Sheet.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
erp5/trunk/products/ERP5/bootstrap/portal_types.xml
erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py
erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py
erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Sheet.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%2520Sheet.xml?rev=43214&r1=43213&r2=43214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Sheet.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Property%20Sheet.xml [utf8] Wed Feb 9 09:58:06 2011
@@ -2,7 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ <global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
@@ -61,7 +61,7 @@
</item>
<item>
<key> <string>type_class</string> </key>
- <value> <string>Folder</string> </value>
+ <value> <string>PropertySheet</string> </value>
</item>
<item>
<key> <string>type_interface_list</string> </key>
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=43214&r1=43213&r2=43214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Feb 9 09:58:06 2011
@@ -1 +1 @@
-40874
\ No newline at end of file
+40875
\ No newline at end of file
Modified: erp5/trunk/products/ERP5/bootstrap/portal_types.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/portal_types.xml?rev=43214&r1=43213&r2=43214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/portal_types.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/portal_types.xml [utf8] Wed Feb 9 09:58:06 2011
@@ -49,7 +49,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>960</long> </value>
+ <value> <long>961</long> </value>
</item>
</dictionary>
</pickle>
@@ -87,11 +87,11 @@
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
<string>Category Acquired Membership Arity Constraint</string>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
- <string>Domain Generator</string>
+ <string>Domain</string>
<persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
- <string>Preference</string>
+ <string>Predicate</string>
<persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
- <string>Simulation Tool</string>
+ <string>Simulation Movement</string>
<persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
</tuple>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
@@ -200,8 +200,6 @@
<persistent> <string encoding="base64">AAAAAAAAAC0=</string> </persistent>
<string>Documentation Helper</string>
<persistent> <string encoding="base64">AAAAAAAAAC4=</string> </persistent>
- <string>Domain</string>
- <persistent> <string encoding="base64">AAAAAAAAAC8=</string> </persistent>
</tuple>
<persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
</tuple>
@@ -214,6 +212,8 @@
<pickle>
<tuple>
<tuple>
+ <string>Domain</string>
+ <persistent> <string encoding="base64">AAAAAAAAAC8=</string> </persistent>
<string>Domain Generator</string>
<persistent> <string encoding="base64">AAAAAAAAADA=</string> </persistent>
<string>Domain Tool</string>
@@ -242,8 +242,6 @@
<persistent> <string encoding="base64">AAAAAAAAADw=</string> </persistent>
<string>Password Tool</string>
<persistent> <string encoding="base64">AAAAAAAAAD0=</string> </persistent>
- <string>Predicate</string>
- <persistent> <string encoding="base64">AAAAAAAAAD4=</string> </persistent>
</tuple>
<persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
</tuple>
@@ -256,6 +254,8 @@
<pickle>
<tuple>
<tuple>
+ <string>Predicate</string>
+ <persistent> <string encoding="base64">AAAAAAAAAD4=</string> </persistent>
<string>Preference</string>
<persistent> <string encoding="base64">AAAAAAAAAD8=</string> </persistent>
<string>Preference Tool</string>
@@ -284,8 +284,6 @@
<persistent> <string encoding="base64">AAAAAAAAAEs=</string> </persistent>
<string>Session Tool</string>
<persistent> <string encoding="base64">AAAAAAAAAEw=</string> </persistent>
- <string>Simulation Movement</string>
- <persistent> <string encoding="base64">AAAAAAAAAE0=</string> </persistent>
</tuple>
<persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
</tuple>
@@ -298,6 +296,8 @@
<pickle>
<tuple>
<tuple>
+ <string>Simulation Movement</string>
+ <persistent> <string encoding="base64">AAAAAAAAAE0=</string> </persistent>
<string>Simulation Tool</string>
<persistent> <string encoding="base64">AAAAAAAAAE4=</string> </persistent>
<string>Standard Property</string>
@@ -667,7 +667,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1308</long> </value>
+ <value> <long>1230</long> </value>
</item>
</dictionary>
</pickle>
@@ -761,7 +761,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1392</long> </value>
+ <value> <long>1399</long> </value>
</item>
</dictionary>
</pickle>
@@ -904,7 +904,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1025</long> </value>
+ <value> <long>1229</long> </value>
</item>
</dictionary>
</pickle>
@@ -1045,7 +1045,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1490</long> </value>
+ <value> <long>1499</long> </value>
</item>
</dictionary>
</pickle>
@@ -1139,7 +1139,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1224</long> </value>
+ <value> <long>1308</long> </value>
</item>
</dictionary>
</pickle>
@@ -1235,7 +1235,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1024</long> </value>
+ <value> <long>1228</long> </value>
</item>
</dictionary>
</pickle>
@@ -1367,7 +1367,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1223</long> </value>
+ <value> <long>1498</long> </value>
</item>
</dictionary>
</pickle>
@@ -1498,7 +1498,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1222</long> </value>
+ <value> <long>1398</long> </value>
</item>
</dictionary>
</pickle>
@@ -1602,7 +1602,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1221</long> </value>
+ <value> <long>1016</long> </value>
</item>
</dictionary>
</pickle>
@@ -1712,7 +1712,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1307</long> </value>
+ <value> <long>1497</long> </value>
</item>
</dictionary>
</pickle>
@@ -1843,7 +1843,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1391</long> </value>
+ <value> <long>1496</long> </value>
</item>
</dictionary>
</pickle>
@@ -1996,7 +1996,7 @@
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1220</long> </value>
+ <value> <long>1227</long> </value>
</item>
</dictionary>
</pickle>
@@ -2142,7 +2142,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1023</long> </value>
+ <value> <long>1226</long> </value>
</item>
</dictionary>
</pickle>
@@ -2274,7 +2274,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1306</long> </value>
+ <value> <long>1397</long> </value>
</item>
</dictionary>
</pickle>
@@ -2420,7 +2420,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1393</long> </value>
+ <value> <long>1400</long> </value>
</item>
</dictionary>
</pickle>
@@ -2523,7 +2523,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
- <value> <string>40</string> </value>
+ <value> <string>50</string> </value>
</item>
<item>
<key> <string>product</string> </key>
@@ -2665,7 +2665,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1390</long> </value>
+ <value> <long>1015</long> </value>
</item>
</dictionary>
</pickle>
@@ -2812,7 +2812,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1389</long> </value>
+ <value> <long>1495</long> </value>
</item>
</dictionary>
</pickle>
@@ -2958,7 +2958,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1022</long> </value>
+ <value> <long>1396</long> </value>
</item>
</dictionary>
</pickle>
@@ -3240,7 +3240,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1305</long> </value>
+ <value> <long>1225</long> </value>
</item>
</dictionary>
</pickle>
@@ -3387,7 +3387,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1021</long> </value>
+ <value> <long>1494</long> </value>
</item>
</dictionary>
</pickle>
@@ -3518,7 +3518,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1304</long> </value>
+ <value> <long>1395</long> </value>
</item>
</dictionary>
</pickle>
@@ -3665,7 +3665,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1489</long> </value>
+ <value> <long>1224</long> </value>
</item>
</dictionary>
</pickle>
@@ -3797,7 +3797,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1219</long> </value>
+ <value> <long>1493</long> </value>
</item>
</dictionary>
</pickle>
@@ -3960,7 +3960,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1020</long> </value>
+ <value> <long>1014</long> </value>
</item>
</dictionary>
</pickle>
@@ -4074,7 +4074,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1303</long> </value>
+ <value> <long>1307</long> </value>
</item>
</dictionary>
</pickle>
@@ -4221,7 +4221,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1218</long> </value>
+ <value> <long>1492</long> </value>
</item>
</dictionary>
</pickle>
@@ -4345,7 +4345,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1019</long> </value>
+ <value> <long>1394</long> </value>
</item>
</dictionary>
</pickle>
@@ -4490,7 +4490,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1488</long> </value>
+ <value> <long>1393</long> </value>
</item>
</dictionary>
</pickle>
@@ -4597,7 +4597,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1217</long> </value>
+ <value> <long>1392</long> </value>
</item>
</dictionary>
</pickle>
@@ -4723,7 +4723,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1388</long> </value>
+ <value> <long>1223</long> </value>
</item>
</dictionary>
</pickle>
@@ -4847,7 +4847,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1387</long> </value>
+ <value> <long>1306</long> </value>
</item>
</dictionary>
</pickle>
@@ -4874,15 +4874,21 @@ be a problem).</string> </value>
</value>
</item>
<item>
- <key> <string>_owner</string> </key>
+ <key> <string>allowed_content_types</string> </key>
<value>
- <tuple>
- <list>
- <string>erp5_portal_37c1afef473ee98ba0efc51545eaa18b</string>
- <string>acl_users</string>
- </list>
- <string>ERP5TypeTestCase</string>
- </tuple>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>base_category_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>hidden_content_type_list</string> </key>
+ <value>
+ <tuple/>
</value>
</item>
<item>
@@ -4894,12 +4900,18 @@ be a problem).</string> </value>
<value> <string>Base Type</string> </value>
</item>
<item>
+ <key> <string>property_sheet_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
<key> <string>type_class</string> </key>
<value> <string>DocumentationHelper</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1800</long> </value>
+ <value> <long>1491</long> </value>
</item>
</dictionary>
</pickle>
@@ -5031,7 +5043,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1386</long> </value>
+ <value> <long>1013</long> </value>
</item>
</dictionary>
</pickle>
@@ -5151,7 +5163,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1385</long> </value>
+ <value> <long>1305</long> </value>
</item>
</dictionary>
</pickle>
@@ -5282,7 +5294,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1384</long> </value>
+ <value> <long>1490</long> </value>
</item>
</dictionary>
</pickle>
@@ -5417,7 +5429,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1302</long> </value>
+ <value> <long>1012</long> </value>
</item>
</dictionary>
</pickle>
@@ -5554,7 +5566,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1216</long> </value>
+ <value> <long>1489</long> </value>
</item>
</dictionary>
</pickle>
@@ -5660,7 +5672,7 @@ This portal type is an abstract portal t
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1215</long> </value>
+ <value> <long>1391</long> </value>
</item>
</dictionary>
</pickle>
@@ -5785,7 +5797,7 @@ This portal type is an abstract portal t
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1301</long> </value>
+ <value> <long>1222</long> </value>
</item>
</dictionary>
</pickle>
@@ -5927,7 +5939,7 @@ This portal type is an abstract portal t
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1487</long> </value>
+ <value> <long>1390</long> </value>
</item>
</dictionary>
</pickle>
@@ -6035,7 +6047,7 @@ identify a bank account.</string> </valu
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1486</long> </value>
+ <value> <long>1304</long> </value>
</item>
</dictionary>
</pickle>
@@ -6136,7 +6148,7 @@ identify a bank account.</string> </valu
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1214</long> </value>
+ <value> <long>1303</long> </value>
</item>
</dictionary>
</pickle>
@@ -6304,7 +6316,7 @@ identify a bank account.</string> </valu
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1018</long> </value>
+ <value> <long>1488</long> </value>
</item>
</dictionary>
</pickle>
@@ -6408,7 +6420,7 @@ identify a bank account.</string> </valu
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1017</long> </value>
+ <value> <long>1389</long> </value>
</item>
</dictionary>
</pickle>
@@ -6502,7 +6514,7 @@ identify a bank account.</string> </valu
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1485</long> </value>
+ <value> <long>1011</long> </value>
</item>
</dictionary>
</pickle>
@@ -6609,7 +6621,7 @@ identify a bank account.</string> </valu
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1484</long> </value>
+ <value> <long>1487</long> </value>
</item>
</dictionary>
</pickle>
@@ -6730,7 +6742,7 @@ identify a bank account.</string> </valu
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1483</long> </value>
+ <value> <long>1221</long> </value>
</item>
</dictionary>
</pickle>
@@ -6855,7 +6867,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1016</long> </value>
+ <value> <long>1010</long> </value>
</item>
</dictionary>
</pickle>
@@ -7002,7 +7014,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1383</long> </value>
+ <value> <long>1486</long> </value>
</item>
</dictionary>
</pickle>
@@ -7150,7 +7162,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1015</long> </value>
+ <value> <long>1009</long> </value>
</item>
</dictionary>
</pickle>
@@ -7307,7 +7319,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1300</long> </value>
+ <value> <long>1485</long> </value>
</item>
</dictionary>
</pickle>
@@ -7453,7 +7465,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>type_class</string> </key>
- <value> <string>Folder</string> </value>
+ <value> <string>PropertySheet</string> </value>
</item>
<item>
<key> <string>type_interface_list</string> </key>
@@ -7473,7 +7485,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1213</long> </value>
+ <value> <long>1388</long> </value>
</item>
</dictionary>
</pickle>
@@ -7646,7 +7658,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1299</long> </value>
+ <value> <long>1220</long> </value>
</item>
</dictionary>
</pickle>
@@ -7815,7 +7827,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1382</long> </value>
+ <value> <long>1302</long> </value>
</item>
</dictionary>
</pickle>
@@ -7948,7 +7960,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1381</long> </value>
+ <value> <long>1008</long> </value>
</item>
</dictionary>
</pickle>
@@ -8074,7 +8086,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1014</long> </value>
+ <value> <long>1301</long> </value>
</item>
</dictionary>
</pickle>
@@ -8227,7 +8239,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1013</long> </value>
+ <value> <long>1484</long> </value>
</item>
</dictionary>
</pickle>
@@ -8337,7 +8349,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1298</long> </value>
+ <value> <long>1483</long> </value>
</item>
</dictionary>
</pickle>
@@ -8482,7 +8494,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1380</long> </value>
+ <value> <long>1482</long> </value>
</item>
</dictionary>
</pickle>
@@ -8594,7 +8606,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1379</long> </value>
+ <value> <long>1300</long> </value>
</item>
</dictionary>
</pickle>
@@ -8688,7 +8700,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1378</long> </value>
+ <value> <long>1299</long> </value>
</item>
</dictionary>
</pickle>
@@ -8809,7 +8821,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1012</long> </value>
+ <value> <long>1481</long> </value>
</item>
</dictionary>
</pickle>
@@ -8954,7 +8966,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1011</long> </value>
+ <value> <long>1298</long> </value>
</item>
</dictionary>
</pickle>
@@ -9085,7 +9097,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1010</long> </value>
+ <value> <long>1387</long> </value>
</item>
</dictionary>
</pickle>
@@ -9228,7 +9240,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1212</long> </value>
+ <value> <long>1219</long> </value>
</item>
</dictionary>
</pickle>
@@ -9322,7 +9334,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1482</long> </value>
+ <value> <long>1007</long> </value>
</item>
</dictionary>
</pickle>
@@ -9453,7 +9465,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1297</long> </value>
+ <value> <long>1386</long> </value>
</item>
</dictionary>
</pickle>
@@ -9602,7 +9614,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1377</long> </value>
+ <value> <long>1297</long> </value>
</item>
</dictionary>
</pickle>
@@ -9749,7 +9761,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1009</long> </value>
+ <value> <long>1006</long> </value>
</item>
</dictionary>
</pickle>
@@ -9896,7 +9908,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1008</long> </value>
+ <value> <long>1005</long> </value>
</item>
</dictionary>
</pickle>
@@ -9990,7 +10002,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1376</long> </value>
+ <value> <long>1296</long> </value>
</item>
</dictionary>
</pickle>
@@ -10143,7 +10155,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1007</long> </value>
+ <value> <long>1004</long> </value>
</item>
</dictionary>
</pickle>
@@ -10296,7 +10308,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1006</long> </value>
+ <value> <long>1385</long> </value>
</item>
</dictionary>
</pickle>
@@ -10449,7 +10461,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1005</long> </value>
+ <value> <long>1295</long> </value>
</item>
</dictionary>
</pickle>
@@ -10579,7 +10591,7 @@ Other predicates must be implemented thr
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1004</long> </value>
+ <value> <long>1003</long> </value>
</item>
</dictionary>
</pickle>
@@ -10700,7 +10712,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1211</long> </value>
+ <value> <long>1002</long> </value>
</item>
</dictionary>
</pickle>
@@ -10841,7 +10853,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1210</long> </value>
+ <value> <long>1001</long> </value>
</item>
</dictionary>
</pickle>
@@ -10986,7 +10998,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1003</long> </value>
+ <value> <long>1218</long> </value>
</item>
</dictionary>
</pickle>
@@ -11098,7 +11110,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>uid</string> </key>
- <value> <long>1296</long> </value>
+ <value> <long>1000</long> </value>
</item>
</dictionary>
</pickle>
@@ -11960,25 +11972,25 @@ be a problem).</string> </value>
<tuple>
<tuple>
<tuple>
- <string>31</string>
+ <string>41</string>
<persistent> <string encoding="base64">AAAAAAAAAas=</string> </persistent>
- <string>32</string>
+ <string>42</string>
<persistent> <string encoding="base64">AAAAAAAAAaw=</string> </persistent>
- <string>33</string>
+ <string>43</string>
<persistent> <string encoding="base64">AAAAAAAAAa0=</string> </persistent>
- <string>34</string>
+ <string>44</string>
<persistent> <string encoding="base64">AAAAAAAAAa4=</string> </persistent>
- <string>35</string>
+ <string>45</string>
<persistent> <string encoding="base64">AAAAAAAAAa8=</string> </persistent>
- <string>36</string>
+ <string>46</string>
<persistent> <string encoding="base64">AAAAAAAAAbA=</string> </persistent>
- <string>37</string>
+ <string>47</string>
<persistent> <string encoding="base64">AAAAAAAAAbE=</string> </persistent>
- <string>38</string>
+ <string>48</string>
<persistent> <string encoding="base64">AAAAAAAAAbI=</string> </persistent>
- <string>39</string>
+ <string>49</string>
<persistent> <string encoding="base64">AAAAAAAAAbM=</string> </persistent>
- <string>40</string>
+ <string>50</string>
<persistent> <string encoding="base64">AAAAAAAAAbQ=</string> </persistent>
</tuple>
</tuple>
@@ -17365,25 +17377,25 @@ be a problem).</string> </value>
<tuple>
<tuple>
<tuple>
- <string>31</string>
+ <string>41</string>
<int>1</int>
- <string>32</string>
+ <string>42</string>
<int>1</int>
- <string>33</string>
+ <string>43</string>
<int>1</int>
- <string>34</string>
+ <string>44</string>
<int>1</int>
- <string>35</string>
+ <string>45</string>
<int>1</int>
- <string>36</string>
+ <string>46</string>
<int>1</int>
- <string>37</string>
+ <string>47</string>
<int>1</int>
- <string>38</string>
+ <string>48</string>
<int>1</int>
- <string>39</string>
+ <string>49</string>
<int>1</int>
- <string>40</string>
+ <string>50</string>
<int>1</int>
</tuple>
</tuple>
@@ -17429,7 +17441,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>31</string> </value>
+ <value> <string>41</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17490,7 +17502,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>32</string> </value>
+ <value> <string>42</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17551,7 +17563,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>33</string> </value>
+ <value> <string>43</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17612,7 +17624,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>34</string> </value>
+ <value> <string>44</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17673,7 +17685,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>35</string> </value>
+ <value> <string>45</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17734,7 +17746,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>36</string> </value>
+ <value> <string>46</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17795,7 +17807,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>37</string> </value>
+ <value> <string>47</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17856,7 +17868,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>38</string> </value>
+ <value> <string>48</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17925,7 +17937,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>39</string> </value>
+ <value> <string>49</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
@@ -17986,7 +17998,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>40</string> </value>
+ <value> <string>50</string> </value>
</item>
<item>
<key> <string>reference</string> </key>
Added: erp5/trunk/products/ERP5Type/Core/PropertySheet.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/PropertySheet.py?rev=43214&view=auto
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/PropertySheet.py (added)
+++ erp5/trunk/products/ERP5Type/Core/PropertySheet.py [utf8] Wed Feb 9 09:58:06 2011
@@ -0,0 +1,103 @@
+##############################################################################
+#
+# Copyright (c) 2011 Nexedi SARL and Contributors. All Rights Reserved.
+# Arnaud Fontaine <arnaud.fontaine at nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from Products.ERP5Type.Core.Folder import Folder
+from AccessControl import ClassSecurityInfo
+from Products.ERP5Type import Permissions
+from Products.ERP5Type.Base import PropertyHolder
+from Products.ERP5Type.dynamic.accessor_holder import AccessorHolderType
+
+from zLOG import LOG, INFO
+
+class PropertySheet(Folder):
+ """
+ Define a Property Sheet for ZODB Property Sheets, which contains
+ properties (such as Standard Property), categories (such as Category
+ Property) and/or constraints (such as Property Existence Constraint)
+ """
+ meta_type = 'ERP5 Property Sheet'
+ portal_type = 'Property Sheet'
+
+ # Declarative security
+ security = ClassSecurityInfo()
+ security.declareObjectProtected(Permissions.AccessContentsInformation)
+
+ security.declareProtected(Permissions.AccessContentsInformation,
+ 'exportToFilesystemDefinition')
+ def exportToFilesystemDefinition(self):
+ """
+ Export the ZODB Property Sheet to its filesystem definition as a
+ tuple (properties, categories, constraints)
+ """
+ properties = []
+ constraints = []
+ categories = []
+
+ for item in self.contentValues():
+ definition = item.exportToFilesystemDefinition()
+
+ # If a category doesn't have a name yet or the constraint class
+ # returned is None, then just skip it
+ if definition is None:
+ LOG("ERP5Type.Core.PropertySheet", INFO,
+ "Skipping property with ID '%s' in Property Sheet '%s'" % \
+ (item.getId(), self.getId()))
+
+ continue
+
+ portal_type = item.getPortalType()
+
+ if portal_type == "Category Property" or \
+ portal_type == "Dynamic Category Property":
+ categories.append(definition)
+
+ elif portal_type.endswith('Constraint'):
+ constraints.append(definition)
+
+ else:
+ properties.append(definition)
+
+ return (properties, categories, constraints)
+
+ security.declarePrivate('createAccessorHolder')
+ def createAccessorHolder(self):
+ """
+ Create a new accessor holder from the Property Sheet (the
+ accessors are created through a Property Holder)
+ """
+ property_holder = PropertyHolder(self.getId())
+
+ # Prepare the Property Holder
+ property_holder._properties, \
+ property_holder._categories, \
+ property_holder._constraints = self.exportToFilesystemDefinition()
+
+ return AccessorHolderType.fromPropertyHolder(
+ property_holder,
+ self.getPortalObject(),
+ 'erp5.accessor_holder')
Modified: erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py?rev=43214&r1=43213&r2=43214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/PropertySheetTool.py [utf8] Wed Feb 9 09:58:06 2011
@@ -33,12 +33,9 @@ from AccessControl import ClassSecurityI
from Products.ERP5Type.Tool.BaseTool import BaseTool
from Products.ERP5Type import Permissions
from Products.ERP5Type.Accessor import Translation
-from Products.ERP5Type.Base import PropertyHolder
from Products.CMFCore.utils import getToolByName
from Products.CMFCore.Expression import Expression
-from Products.ERP5Type.dynamic.accessor_holder import AccessorHolderType
-
from zLOG import LOG, INFO, WARNING
class PropertySheetTool(BaseTool):
@@ -206,68 +203,6 @@ class PropertySheetTool(BaseTool):
return self.Base_redirect('view',
keep_items={'portal_status_message': message})
- security.declareProtected(Permissions.AccessContentsInformation,
- 'exportPropertySheetToFilesystemDefinitionTuple')
- def exportPropertySheetToFilesystemDefinitionTuple(self, property_sheet):
- """
- Export a given ZODB Property Sheet to its filesystem definition as
- tuple (properties, categories, constraints)
-
- XXX: Move this code and the accessor generation code (from Utils)
- within their respective documents
- """
- properties = []
- constraints = []
- categories = []
-
- for property in property_sheet.contentValues():
- property_definition = property.exportToFilesystemDefinition()
-
- # If a category doesn't have a name yet or the constraint class
- # returned is None, then just skip it
- if property_definition is None:
- LOG("Tool.PropertySheetTool", INFO,
- "Skipping property with ID '%s' in Property Sheet '%s'" % \
- (property.getId(), property_sheet.getId()))
-
- continue
-
- portal_type = property.getPortalType()
-
- if portal_type == "Category Property" or \
- portal_type == "Dynamic Category Property":
- categories.append(property_definition)
-
- elif portal_type.endswith('Constraint'):
- constraints.append(property_definition)
-
- else:
- properties.append(property_definition)
-
- return (properties, categories, constraints)
-
- security.declarePrivate('createZodbPropertySheetAccessorHolder')
- def createZodbPropertySheetAccessorHolder(self, property_sheet):
- """
- Create a new accessor holder from the given ZODB Property Sheet
- (the accessors are created through a Property Holder)
- """
- property_sheet_name = property_sheet.getId()
- definition_tuple = \
- self.exportPropertySheetToFilesystemDefinitionTuple(property_sheet)
-
- property_holder = PropertyHolder(property_sheet_name)
-
- # Prepare the Property Holder
- property_holder._properties, \
- property_holder._categories, \
- property_holder._constraints = definition_tuple
-
- return AccessorHolderType.fromPropertyHolder(
- property_holder,
- self.getPortalObject(),
- 'erp5.accessor_holder')
-
security.declareProtected(Permissions.ManagePortal,
'getPropertyAvailablePermissionList')
def getPropertyAvailablePermissionList(self):
Modified: erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py?rev=43214&r1=43213&r2=43214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py [utf8] Wed Feb 9 09:58:06 2011
@@ -90,10 +90,8 @@ def _createAccessorHolderList(site,
except AttributeError:
# Generate the accessor holder as it has not been done yet
try:
- accessor_holder_class = \
- property_sheet_tool.createZodbPropertySheetAccessorHolder(
- getattr(property_sheet_tool,
- property_sheet_name))
+ property_sheet = getattr(property_sheet_tool, property_sheet_name)
+ accessor_holder_class = property_sheet.createAccessorHolder()
except:
LOG("ERP5Type.dynamic", ERROR,
Modified: erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py?rev=43214&r1=43213&r2=43214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/testDynamicClassGeneration.py [utf8] Wed Feb 9 09:58:06 2011
@@ -1257,8 +1257,7 @@ class TestZodbImportFilesystemPropertySh
self.portal.portal_property_sheets.objectIds())
zodb_property_tuple, zodb_category_tuple, zodb_constraint_class_tuple = \
- portal.exportPropertySheetToFilesystemDefinitionTuple(
- zodb_property_sheet)
+ zodb_property_sheet.exportToFilesystemDefinition()
self._checkPropertyOrConstraintDefinitionTuple(
property_sheet_name,
More information about the Erp5-report
mailing list