[Erp5-report] r21671 - in /erp5admin/trunk/erp5_admin: SkinTemplateItem/portal_skins/erp5_a...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jun 18 11:29:41 CEST 2008
Author: bartek
Date: Wed Jun 18 11:29:40 2008
New Revision: 21671
URL: http://svn.erp5.org?rev=21671&view=rev
Log:
working version for 2.3 (new dialog)
Modified:
erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_customizeObject.xml
erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getFormLocationInfo.xml
erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_revertObject.xml
erp5admin/trunk/erp5_admin/bt/revision
erp5admin/trunk/erp5_admin/bt/version
Modified: erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_customizeObject.xml
URL: http://svn.erp5.org/erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_customizeObject.xml?rev=21671&r1=21670&r2=21671&view=diff
==============================================================================
--- erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_customizeObject.xml (original)
+++ erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_customizeObject.xml Wed Jun 18 11:29:40 2008
@@ -69,14 +69,18 @@
Customize an object (form, script) by copying to a selected skin\n
(supposedly higher up in skin queue)\n
redirect to management tab of the new one\n
+ can start from default object location or version in specified skin\n
"""\n
\n
-object_path = context.Admin_getDefaultObjectPath(object_id)\n
-current_skin_id = object_path[-2] # we know that\n
-current_skin = context.restrictedTraverse(current_skin_id)\n
-object_value = context.restrictedTraverse(object_path)\n
-cp = current_skin.manage_copyObjects(ids=[object_id])\n
-skin = context.restrictedTraverse(skin_id)\n
+if source_skin_id == \'\':\n
+ object_path = context.Admin_getDefaultObjectPath(object_id)\n
+ source_skin_id = object_path[-2] # we know that\n
+else:\n
+ source_skin = context.portal_skins.restrictedTraverse(source_skin_id)\n
+ object_path = \'/\'.join((source_skin_id, object_id))\n
+object_value = context.portal_skins.restrictedTraverse(object_path)\n
+cp = source_skin.manage_copyObjects(ids=[object_id])\n
+skin = context.portal_skins.restrictedTraverse(skin_id)\n
skin.manage_pasteObjects(cp)\n
\n
new_object = getattr(skin, object_id)\n
@@ -98,7 +102,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>object_id, skin_id</string> </value>
+ <value> <string>object_id, skin_id, source_skin_id=\'\'</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -118,7 +122,7 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>2</int> </value>
+ <value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -126,12 +130,12 @@
<tuple>
<string>object_id</string>
<string>skin_id</string>
+ <string>source_skin_id</string>
<string>_getattr_</string>
-<string>context</string>
+ <string>context</string>
<string>object_path</string>
<string>_getitem_</string>
- <string>current_skin_id</string>
- <string>current_skin</string>
+ <string>source_skin</string>
<string>object_value</string>
<string>cp</string>
<string>skin</string>
@@ -149,7 +153,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <string></string>
+ </tuple>
</value>
</item>
<item>
Modified: erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getFormLocationInfo.xml
URL: http://svn.erp5.org/erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getFormLocationInfo.xml?rev=21671&r1=21670&r2=21671&view=diff
==============================================================================
--- erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getFormLocationInfo.xml (original)
+++ erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getFormLocationInfo.xml Wed Jun 18 11:29:40 2008
@@ -72,32 +72,61 @@
\n
st = context.portal_skins\n
path = st.getSkinPath(\'View\')\n
-info_dict = dict(\n
- form_id = object_id,\n
- location = \'\',\n
- overwrites = [],\n
- customize = [],\n
- portal_url = context.getPortalObject().absolute_url() )\n
-\n
-found = False\n
+def createInfoDict():\n
+ info_dict = dict(\n
+ form_id = object_id,\n
+ location = \'\',\n
+ overwrites = [],\n
+ customize = [],\n
+ is_overwritten = [],\n
+ portal_url = context.getPortalObject().absolute_url() )\n
+ return info_dict\n
+\n
+\n
+info_dict = createInfoDict()\n
+\n
+if skin_id is not None:\n
+ info_dict[\'location\'] = skin_id\n
+\n
+found = found_first = False\n
+\n
for p in path.split(\',\'):\n
skin = getattr(st, p)\n
- if not found:\n
- info_dict[\'customize\'].append(p)\n
f = getattr(skin, object_id)\n
path = f.getPhysicalPath()\n
- if \'portal_skins\' in path:\n
- if not found:\n
+ if skin_id is None:\n
+ if not found and \'portal_skins\' not in path:\n
+ info_dict[\'customize\'].append(p)\n
+ if \'portal_skins\' in path:\n
+ if not found:\n
+ found = True\n
+ info_dict[\'location\'] = p\n
+ #try:\n
+ # info_dict[\'customize\'].pop()\n
+ #except IndexError:\n
+ # pass\n
+ else:\n
+ info_dict[\'overwrites\'].append(p)\n
+ else:\n
+ if \'portal_skins\' in path:\n
+ found_first = True\n
+ if skin_id in path:\n
found = True\n
- info_dict[\'location\'] = p\n
- try:\n
- info_dict[\'customize\'].pop()\n
- except IndexError:\n
- pass\n
+ if not found_first:\n
+ info_dict[\'customize\'].append(p)\n
else:\n
- info_dict[\'overwrites\'].append(p)\n
-\n
+ if \'portal_skins\' in path:\n
+ if not found:\n
+ info_dict[\'is_overwritten\'].append(p)\n
+ else:\n
+ if skin_id not in path:\n
+ info_dict[\'overwrites\'].append(p)\n
+\n
+if not found:\n
+ return createInfoDict() # if it was called with skin_id in which it is not present return empty dict\n
return info_dict\n
+\n
+# vim:set filetype=python:\n
</string> </value>
</item>
<item>
@@ -114,7 +143,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>object_id</string> </value>
+ <value> <string>object_id, skin_id=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -134,30 +163,32 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>object_id</string>
+ <string>skin_id</string>
<string>_getattr_</string>
<string>context</string>
<string>st</string>
<string>path</string>
- <string>dict</string>
+ <string>createInfoDict</string>
<string>info_dict</string>
+ <string>None</string>
+ <string>_write_</string>
<string>False</string>
<string>found</string>
+ <string>found_first</string>
<string>_getiter_</string>
<string>p</string>
<string>getattr</string>
<string>skin</string>
+ <string>f</string>
<string>_getitem_</string>
- <string>f</string>
<string>True</string>
- <string>_write_</string>
- <string>IndexError</string>
</tuple>
</value>
</item>
@@ -169,7 +200,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <none/>
+ </tuple>
</value>
</item>
<item>
Modified: erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_revertObject.xml
URL: http://svn.erp5.org/erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_revertObject.xml?rev=21671&r1=21670&r2=21671&view=diff
==============================================================================
--- erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_revertObject.xml (original)
+++ erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_revertObject.xml Wed Jun 18 11:29:40 2008
@@ -81,7 +81,7 @@
if \'portal_skins\' in path:\n
if skin_id in path:\n
# this is the version we are reverting to\n
- return\n
+ return context.REQUEST.RESPONSE.redirect(f.absolute_url() + \'/manage_main\')\n
else:\n
# remove\n
if backup:\n
Modified: erp5admin/trunk/erp5_admin/bt/revision
URL: http://svn.erp5.org/erp5admin/trunk/erp5_admin/bt/revision?rev=21671&r1=21670&r2=21671&view=diff
==============================================================================
--- erp5admin/trunk/erp5_admin/bt/revision (original)
+++ erp5admin/trunk/erp5_admin/bt/revision Wed Jun 18 11:29:40 2008
@@ -1,1 +1,1 @@
-27
+28
Modified: erp5admin/trunk/erp5_admin/bt/version
URL: http://svn.erp5.org/erp5admin/trunk/erp5_admin/bt/version?rev=21671&r1=21670&r2=21671&view=diff
==============================================================================
--- erp5admin/trunk/erp5_admin/bt/version (original)
+++ erp5admin/trunk/erp5_admin/bt/version Wed Jun 18 11:29:40 2008
@@ -1,1 +1,1 @@
-0.1
+2.3
More information about the Erp5-report
mailing list