Skip to content

erp5
erp5
Commit 7af6edec authored by Aurel's avatar Aurel
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 861 additions and 16 deletions
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffObjectList.xml 0 → 100755
View file @ 7af6edec
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value> <string encoding="base64">O/INCg==</string> </value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</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 encoding="cdata"><![CDATA[
from Products.ERP5Type.Document import newTempBase\n
from Products.ERP5Type.Cache import CachingMethod\n
# from Products.ERP5.Document.BusinessTemplate import TemplateConditionError\n
\n
# get selected business templates\n
p = context.getPortalObject()\n
portal_selections = p.portal_selections\n
selection_name = \'business_template_selection\' # harcoded because we can also get delete_selection\n
uids = portal_selections.getSelectionCheckedUidsFor(selection_name)\n
\n
if len(uids) > 2:\n
raise \'TemplateConditionError\', \'Too many Business Templates selected\'\n
\n
bt1 = context.portal_catalog.getObject(uids[0])\n
if bt1.getBuildingState() != \'built\':\n
raise \'TemplateConditionError\', \'Business Template must be built to make diff\'\n
if (getattr(bt1, \'template_format_version\', 0)) != 1:\n
raise \'TemplateConditionError\', \'Business Template must be in new format\'\n
\n
# check if there is a second bt or if we compare to installed one\n
if len(uids) == 2:\n
bt2 = context.portal_catalog.getObject(uids[1])\n
if bt2.getBuildingState() != \'built\':\n
raise \'TemplateConditionError\', \'Business Template must be built to make diff\'\n
if (getattr(bt2, \'template_format_version\', 0)) != 1:\n
raise \'TemplateConditionError\', \'Business Template must be in new format\'\n
\n
def getModifiedObjectList(bt1, bt2):\n
return bt1.preinstall(compare_to=bt2)\n
\n
getModifiedObjectList = CachingMethod(getModifiedObjectList, id=\'BusinessTemplate_getModifiedObjectList\', cache_duration=3)\n
\n
if p.portal_templates.compareVersions(bt1.getVersion(), bt2.getVersion()) < 0:\n
modified_object_list = getModifiedObjectList(bt2, bt1)\n
else:\n
modified_object_list = getModifiedObjectList(bt1, bt2)\n
\n
keys = modified_object_list.keys()\n
keys.sort()\n
\n
i = 0\n
object_list = []\n
for object_id in keys: \n
object_state, object_class = modified_object_list[object_id]\n
line = newTempBase(context, \'tmp_install_%s\' %(str(i)))\n
line.edit(object_id=object_id, object_state=object_state, object_class=object_class, bt1=bt1.getId(), bt2=bt2.getId())\n
line.setUid(\'new_%s\' % object_id)\n
object_list.append(line)\n
i += 1 \n
\n
return object_list\n
]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAABsAAAAlAAAASwAA
AHPyAgAAZAEAawAAbAEAfQIAAWQCAGsCAGwDAH0EAAF0BAB0BQBkAwCDAgCDAAB9BwB0BAB8BwBk
BACDAgB9CABkBQB9CQB0BAB8CABkBgCDAgB8CQCDAQB9CgB0CgB8CgCDAQBkBwBqBABvDQABZAgA
ZAkAggIAbgEAAXQEAHQEAHQFAGQKAIMCAGQLAIMCAHQLAHwKAGQMAIMCAIMBAH0NAHQEAHwNAGQN
AIMCAIMAAGQOAGoDAG8NAAFkCABkDwCCAgBuAQABdA0AfA0AZBAAZAwAgwMAZBEAagMAbw0AAWQI
AGQSAIICAG4BAAF0CgB8CgCDAQBkBwBqAgBvdwABdAQAdAQAdAUAZAoAgwIAZAsAgwIAdAsAfAoA
ZBEAgwIAgwEAfQ8AdAQAfA8AZA0AgwIAgwAAZA4AagMAbw0AAWQIAGQPAIICAG4BAAF0DQB8DwBk
EABkDACDAwBkEQBqAwBvDQABZAgAZBIAggIAcXMBAW4BAAFkEwCEAAB9EAB8BAB8EABkFABkFQBk
FgBkFwCDAQJ9EAB0BAB0BAB8BwBkGACDAgBkGQCDAgB0BAB8DQBkGgCDAgCDAAB0BAB8DwBkGgCD
AgCDAACDAgBkDABqAABvEwABfBAAfA8AfA0AgwIAfREAbhAAAXwQAHwNAHwPAIMCAH0RAHQEAHwR
AGQbAIMCAIMAAH0SAHQEAHwSAGQcAIMCAIMAAAFkDAB9EwBnAAB9FAB4wwB0FAB8EgCDAQBEXbUA
fRYAdAsAfBEAfBYAgwIAdBQAAoMBAFwCAH0XAH0YAHwCAHQFAGQdAHQYAHwTAIMBABaDAgB9GgB0
BAB8GgBkHgCDAgBkHwB8FgBkIAB8FwBkIQB8GABkIgB0BAB8DQBkIwCDAgCDAABkJAB0BAB8DwBk
IwCDAgCDAACDAAUBdAQAfBoAZCUAgwIAZCYAfBYAFoMBAAF0BAB8FABkJwCDAgB8GgCDAQABfBMA
ZBEAN30TAHExAld8FABTZAAAUygoAAAATigBAAAAcwsAAABuZXdUZW1wQmFzZSgBAAAAcw0AAABD
YWNoaW5nTWV0aG9kcw8AAABnZXRQb3J0YWxPYmplY3RzEQAAAHBvcnRhbF9zZWxlY3Rpb25zcxsA
AABidXNpbmVzc190ZW1wbGF0ZV9zZWxlY3Rpb25zGgAAAGdldFNlbGVjdGlvbkNoZWNrZWRVaWRz
Rm9yaQIAAABzFgAAAFRlbXBsYXRlQ29uZGl0aW9uRXJyb3JzJAAAAFRvbyBtYW55IEJ1c2luZXNz
IFRlbXBsYXRlcyBzZWxlY3RlZHMOAAAAcG9ydGFsX2NhdGFsb2dzCQAAAGdldE9iamVjdGkAAAAA
cxAAAABnZXRCdWlsZGluZ1N0YXRlcwUAAABidWlsdHMsAAAAQnVzaW5lc3MgVGVtcGxhdGUgbXVz
dCBiZSBidWlsdCB0byBtYWtlIGRpZmZzFwAAAHRlbXBsYXRlX2Zvcm1hdF92ZXJzaW9uaQEAAABz
JwAAAEJ1c2luZXNzIFRlbXBsYXRlIG11c3QgYmUgaW4gbmV3IGZvcm1hdGMCAAAAAwAAAAQAAABD
AAAAcxoAAAB0AAB8AABkAQCDAgBkAgB8AQCDAAFTZAAAUygDAAAATnMKAAAAcHJlaW5zdGFsbHMK
AAAAY29tcGFyZV90bygDAAAAcwkAAABfZ2V0YXR0cl9zAwAAAGJ0MXMDAAAAYnQyKAMAAABzAwAA
AGJ0MXMDAAAAYnQycwkAAABfZ2V0YXR0cl8oAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilz
FQAAAGdldE1vZGlmaWVkT2JqZWN0TGlzdBwAAABzAgAAAAABcwIAAABpZHMmAAAAQnVzaW5lc3NU
ZW1wbGF0ZV9nZXRNb2RpZmllZE9iamVjdExpc3RzDgAAAGNhY2hlX2R1cmF0aW9uaQMAAABzEAAA
AHBvcnRhbF90ZW1wbGF0ZXNzDwAAAGNvbXBhcmVWZXJzaW9uc3MKAAAAZ2V0VmVyc2lvbnMEAAAA
a2V5c3MEAAAAc29ydHMOAAAAdG1wX2luc3RhbGxfJXNzBAAAAGVkaXRzCQAAAG9iamVjdF9pZHMM
AAAAb2JqZWN0X3N0YXRlcwwAAABvYmplY3RfY2xhc3NzAwAAAGJ0MXMFAAAAZ2V0SWRzAwAAAGJ0
MnMGAAAAc2V0VWlkcwYAAABuZXdfJXNzBgAAAGFwcGVuZCgaAAAAcxoAAABQcm9kdWN0cy5FUlA1
VHlwZS5Eb2N1bWVudHMLAAAAbmV3VGVtcEJhc2VzFwAAAFByb2R1Y3RzLkVSUDVUeXBlLkNhY2hl
cw0AAABDYWNoaW5nTWV0aG9kcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzAQAAAHBzEQAAAHBv
cnRhbF9zZWxlY3Rpb25zcw4AAABzZWxlY3Rpb25fbmFtZXMEAAAAdWlkc3MDAAAAbGVucwkAAABf
Z2V0aXRlbV9zAwAAAGJ0MXMHAAAAZ2V0YXR0cnMDAAAAYnQycxUAAABnZXRNb2RpZmllZE9iamVj
dExpc3RzFAAAAG1vZGlmaWVkX29iamVjdF9saXN0cwQAAABrZXlzcwEAAABpcwsAAABvYmplY3Rf
bGlzdHMJAAAAX2dldGl0ZXJfcwkAAABvYmplY3RfaWRzDAAAAG9iamVjdF9zdGF0ZXMMAAAAb2Jq
ZWN0X2NsYXNzcwMAAABzdHJzBAAAAGxpbmUoGwAAAHMCAAAAa3dzGgAAAFByb2R1Y3RzLkVSUDVU
eXBlLkRvY3VtZW50cwsAAABuZXdUZW1wQmFzZXMXAAAAUHJvZHVjdHMuRVJQNVR5cGUuQ2FjaGVz
DQAAAENhY2hpbmdNZXRob2RzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMBAAAAcHMRAAAAcG9y
dGFsX3NlbGVjdGlvbnNzDgAAAHNlbGVjdGlvbl9uYW1lcwQAAAB1aWRzcwMAAABsZW5zCQAAAF9n
ZXRpdGVtX3MDAAAAYnQxcwcAAABnZXRhdHRycwMAAABidDJzFQAAAGdldE1vZGlmaWVkT2JqZWN0
TGlzdHMUAAAAbW9kaWZpZWRfb2JqZWN0X2xpc3RzBAAAAGtleXNzAQAAAGlzCwAAAG9iamVjdF9s
aXN0cwkAAABfZ2V0aXRlcl9zCQAAAG9iamVjdF9pZHMMAAAAb2JqZWN0X3N0YXRlcwwAAABvYmpl
Y3RfY2xhc3NzAwAAAHN0cnMEAAAAbGluZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMi
AAAAQnVzaW5lc3NUZW1wbGF0ZV9nZXREaWZmT2JqZWN0TGlzdAEAAABzSAAAAA0BDQQSAQ8BBgEV
AhMBDQInARkBDQEZAQ0DEwEnARkBDQEZARECCQMYAkABEwIPAhUBDQIGAQYBDQAGARwBHAFGARcB
EAEOAigBAAAAcyIAAABCdXNpbmVzc1RlbXBsYXRlX2dldERpZmZPYmplY3RMaXN0KAEAAABzIgAA
AEJ1c2luZXNzVGVtcGxhdGVfZ2V0RGlmZk9iamVjdExpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQg
KFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_core/BusinessTemplate_getDiffObjectList</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</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>kw</string>
<string>Products.ERP5Type.Document</string>
<string>newTempBase</string>
<string>Products.ERP5Type.Cache</string>
<string>CachingMethod</string>
<string>_getattr_</string>
<string>context</string>
<string>p</string>
<string>portal_selections</string>
<string>selection_name</string>
<string>uids</string>
<string>len</string>
<string>_getitem_</string>
<string>bt1</string>
<string>getattr</string>
<string>bt2</string>
<string>getModifiedObjectList</string>
<string>modified_object_list</string>
<string>keys</string>
<string>i</string>
<string>object_list</string>
<string>_getiter_</string>
<string>object_id</string>
<string>object_state</string>
<string>object_class</string>
<string>str</string>
<string>line</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>BusinessTemplate_getDiffObjectList</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffUrl.xml
View file @ 7af6edec
...@@ -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>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewObjectsDiff.xml
View file @ 7af6edec
...@@ -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>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_priority.xml
View file @ 7af6edec
...@@ -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>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDiff.xml
View file @ 7af6edec
...@@ -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>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDiff/diffview.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDiff/listbox.xml
View file @ 7af6edec
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
<string>Products.Formulator.StandardFields</string> <string>Products.ERP5Form.ListBox</string>
<string>TextAreaField</string> <string>ListBox</string>
</tuple> </tuple>
<none/> <none/>
</tuple> </tuple>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>diffview</string> </value> <value> <string>listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -24,22 +24,6 @@ ...@@ -24,22 +24,6 @@
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>The input failed the external validator.</string> </value>
</item> </item>
<item>
<key> <string>line_too_long</string> </key>
<value> <string>A line was too long.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>You entered too many characters.</string> </value>
</item>
<item>
<key> <string>too_many_lines</string> </key>
<value> <string>You entered too many lines.</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -47,10 +31,26 @@ ...@@ -47,10 +31,26 @@
<key> <string>overrides</string> </key> <key> <string>overrides</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>all_editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -59,14 +59,30 @@ ...@@ -59,14 +59,30 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>default_params</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>domain_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -76,47 +92,79 @@ ...@@ -76,47 +92,79 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>global_attributes</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>lines</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>list_action</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_linelength</string> </key> <key> <string>list_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>meta_types</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>portal_types</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>report_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>select</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>sort</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>sort_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>width</string> </key> <key> <string>stat_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>stat_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -126,28 +174,58 @@ ...@@ -126,28 +174,58 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>all_editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </item>
</value> <item>
<key> <string>default_params</string> </key>
<value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>domain_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -157,47 +235,79 @@ ...@@ -157,47 +235,79 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>global_attributes</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>lines</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>list_action</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_linelength</string> </key> <key> <string>list_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>meta_types</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>portal_types</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>report_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>select</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>sort</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>sort_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>width</string> </key> <key> <string>stat_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>stat_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -207,10 +317,45 @@ ...@@ -207,10 +317,45 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>all_editable_columns</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>object_id</string>
<string>Object</string>
</tuple>
<tuple>
<string>object_class</string>
<string>Class</string>
</tuple>
<tuple>
<string>object_state</string>
<string>State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -219,14 +364,40 @@ ...@@ -219,14 +364,40 @@
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>default_params</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>disable_link</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
</item> </item>
<item>
<key> <string>editable_columns</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -236,48 +407,113 @@ ...@@ -236,48 +407,113 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>global_attributes</string> </key>
<value> <string></string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>hidden</string> </key>
<value> <int>40</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>lines</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>list_action</string> </key>
<value> <string></string> </value> <value> <string>Folder_viewContentList</string> </value>
</item> </item>
<item> <item>
<key> <string>max_linelength</string> </key> <key> <string>list_method</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>meta_types</string> </key>
<value> <string></string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>portal_types</string> </key>
<value> <int>0</int> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>report_root_list</string> </key>
<value> <string>Diff View</string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>report_tree</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>search</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>width</string> </key> <key> <string>search_columns</string> </key>
<value> <int>150</int> </value> <value>
<list/>
</value>
</item>
<item>
<key> <string>select</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>business_template_diff_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>stat_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>stat_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>View Diff</string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
<string>object_id</string>
<string>BusinessTemplate_getDiffUrl</string>
</tuple>
<tuple>
<string>object_class</string>
<string>None</string>
</tuple>
<tuple>
<string>object_state</string>
<string>None</string>
</tuple>
</list>
</value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -289,8 +525,8 @@ ...@@ -289,8 +525,8 @@
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
<string>Products.Formulator.TALESField</string> <string>Products.Formulator.MethodField</string>
<string>TALESMethod</string> <string>Method</string>
</tuple> </tuple>
<none/> <none/>
</tuple> </tuple>
...@@ -298,8 +534,8 @@ ...@@ -298,8 +534,8 @@
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>method_name</string> </key>
<value> <string>python: here.diff()</string> </value> <value> <string>BusinessTemplate_getDiffObjectList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
product/ERP5/bootstrap/erp5_core/bt/change_log
View file @ 7af6edec
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7