Commit 7af6edec authored by Aurel's avatar Aurel

2005-12-30 aurel

* remove old view for diff
* modified BusinessTemplate_getDiffUrl, TemplateTool_viewDiff
* add BusinessTemplate_getDiffObjectList,


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4960 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 447a605e
...@@ -69,7 +69,10 @@ ...@@ -69,7 +69,10 @@
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
if brain.object_state == \'Modified\':\n if brain.object_state == \'Modified\':\n
return \'/\'.join(brain.getPhysicalPath()[:-1])+\'/BusinessTemplate_viewObjectsDiff?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class\n if hasattr(brain, \'bt1\'):\n
return \'/\'.join(brain.getPhysicalPath()[:-1])+\'/BusinessTemplate_viewObjectsDiff?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class+\'&bt1=\'+brain.bt1+\'&bt2=\'+brain.bt2\n
else:\n
return \'/\'.join(brain.getPhysicalPath()[:-1])+\'/BusinessTemplate_viewObjectsDiff?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class\n
else:\n else:\n
return None\n return None\n
...@@ -78,18 +81,22 @@ else:\n ...@@ -78,18 +81,22 @@ else:\n
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAgAAAAUAAAAHAAAAQwAA <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAgAAAAYAAAAJAAAAQwAA
AHNzAAAAdAAAfAAAZAEAgwIAZAIAagIAb1UAAXQAAGQDAGQEAIMCAHQCAHQAAHwAAGQFAIMCAIMA AHP6AAAAdAAAfAAAZAEAgwIAZAIAagIAb9wAAXQCAHwAAGQDAIMCAG93AAF0AABkBABkBQCDAgB0
AGQAAGQGAAuFAgCDAgCDAQBkBwAXdAAAfAAAZAgAgwIAF2QJABd0AAB8AABkCgCDAgAXU24FAAF0 AwB0AAB8AABkBgCDAgCDAABkAABkBwALhQIAgwIAgwEAZAgAF3QAAHwAAGQJAIMCABdkCgAXdAAA
AwBTZAAAUygLAAAATnMMAAAAb2JqZWN0X3N0YXRlcwgAAABNb2RpZmllZHMBAAAAL3MEAAAAam9p fAAAZAsAgwIAF2QMABd0AAB8AABkAwCDAgAXZA0AF3QAAHwAAGQOAIMCABdTcfYAAXQAAGQEAGQF
bnMPAAAAZ2V0UGh5c2ljYWxQYXRoaQEAAABzLAAAAC9CdXNpbmVzc1RlbXBsYXRlX3ZpZXdPYmpl AIMCAHQDAHQAAHwAAGQGAIMCAIMAAGQAAGQHAAuFAgCDAgCDAQBkCAAXdAAAfAAAZAkAgwIAF2QK
Y3RzRGlmZj9vYmplY3RfaWQ9cwkAAABvYmplY3RfaWRzDgAAACZvYmplY3RfY2xhc3M9cwwAAABv ABd0AAB8AABkCwCDAgAXU24FAAF0BABTZAAAUygPAAAATnMMAAAAb2JqZWN0X3N0YXRlcwgAAABN
YmplY3RfY2xhc3MoBAAAAHMJAAAAX2dldGF0dHJfcwUAAABicmFpbnMJAAAAX2dldGl0ZW1fcwQA b2RpZmllZHMDAAAAYnQxcwEAAAAvcwQAAABqb2lucw8AAABnZXRQaHlzaWNhbFBhdGhpAQAAAHMs
AABOb25lKAUAAABzBQAAAGJyYWlucwkAAABzZWxlY3Rpb25zCQAAAF9nZXRhdHRyX3MJAAAAX2dl AAAAL0J1c2luZXNzVGVtcGxhdGVfdmlld09iamVjdHNEaWZmP29iamVjdF9pZD1zCQAAAG9iamVj
dGl0ZW1fcwQAAABOb25lKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcxsAAABCdXNpbmVz dF9pZHMOAAAAJm9iamVjdF9jbGFzcz1zDAAAAG9iamVjdF9jbGFzc3MFAAAAJmJ0MT1zBQAAACZi
c1RlbXBsYXRlX2dldERpZmZVcmwBAAAAcwQAAAAWAVUCKAEAAABzGwAAAEJ1c2luZXNzVGVtcGxh dDI9cwMAAABidDIoBQAAAHMJAAAAX2dldGF0dHJfcwUAAABicmFpbnMHAAAAaGFzYXR0cnMJAAAA
dGVfZ2V0RGlmZlVybCgBAAAAcxsAAABCdXNpbmVzc1RlbXBsYXRlX2dldERpZmZVcmwoAAAAACgA X2dldGl0ZW1fcwQAAABOb25lKAYAAABzBQAAAGJyYWlucwkAAABzZWxlY3Rpb25zCQAAAF9nZXRh
AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> dHRyX3MHAAAAaGFzYXR0cnMJAAAAX2dldGl0ZW1fcwQAAABOb25lKAAAAAAoAAAAAHMPAAAAU2Ny
aXB0IChQeXRob24pcxsAAABCdXNpbmVzc1RlbXBsYXRlX2dldERpZmZVcmwBAAAAcwgAAAAWARAB
dwJVAigBAAAAcxsAAABCdXNpbmVzc1RlbXBsYXRlX2dldERpZmZVcmwoAQAAAHMbAAAAQnVzaW5l
c3NUZW1wbGF0ZV9nZXREaWZmVXJsKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8
bW9kdWxlPgEAAABzAAAAAA==</string> </value>
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
...@@ -132,6 +139,7 @@ AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> ...@@ -132,6 +139,7 @@ AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
<string>brain</string> <string>brain</string>
<string>selection</string> <string>selection</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>hasattr</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>None</string> <string>None</string>
</tuple> </tuple>
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Diff Two Object At Installation</string> </value> <value> <string>Diff Two Objects</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode_mode</string> </key> <key> <string>unicode_mode</string> </key>
......
...@@ -142,7 +142,9 @@ ...@@ -142,7 +142,9 @@
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
...@@ -284,4 +286,23 @@ ...@@ -284,4 +286,23 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.portal_membership.checkPermission("Manager", here)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<key> <string>Default</string> </key> <key> <string>Default</string> </key>
<value> <value>
<list> <list>
<string>diffview</string> <string>listbox</string>
</list> </list>
</value> </value>
</item> </item>
......
2005-12-30 aurel 2005-12-30 aurel
* remove old view for diff * remove old view for diff
* modified BusinessTemplate_getDiffUrl, TemplateTool_viewDiff
* add BusinessTemplate_getDiffObjectList,
2005-12-29 aurel 2005-12-29 aurel
* reindex trash bins in ERP5Site_reindexAll * reindex trash bins in ERP5Site_reindexAll
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment