[Erp5-report] r14113 - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 18 17:30:39 CEST 2007
Author: aurel
Date: Wed Apr 18 17:30:33 2007
New Revision: 14113
URL: http://svn.erp5.org?rev=14113&view=rev
Log:
fix some script
Added:
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getPreviousState.xml
Modified:
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedRootSiteList.xml
erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.xml
erp5/trunk/bt5/erp5_banking_core/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedRootSiteList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedRootSiteList.xml?rev=14113&r1=14112&r2=14113&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedRootSiteList.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedRootSiteList.xml Wed Apr 18 17:30:33 2007
@@ -74,9 +74,13 @@
new_site = a.getSiteValue()\n
while new_site.getVaultType()!=\'site\':\n
new_site = new_site.getParentValue()\n
- site_url = new_site.getRelativeUrl()\n
- if site_url not in site_list:\n
- site_list.append(site_url)\n
+ if object:\n
+ if new_site not in site_list:\n
+ site_list.append(new_site)\n
+ else:\n
+ site_url = new_site.getRelativeUrl()\n
+ if site_url not in site_list:\n
+ site_list.append(site_url)\n
return site_list\n
</string> </value>
</item>
@@ -100,7 +104,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>user_id=None, **kw</string> </value>
+ <value> <string>user_id=None, object=0, **kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
@@ -128,13 +132,14 @@
<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>user_id</string>
+ <string>object</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
@@ -157,6 +162,7 @@
<value>
<tuple>
<none/>
+ <int>0</int>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.xml?rev=14113&r1=14112&r2=14113&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.xml (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.xml Wed Apr 18 17:30:33 2007
@@ -70,7 +70,7 @@
user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n
\n
def getUserSiteUid(user_id):\n
- return context.Baobab_getUserAssignmentList(user_id)[0].getSiteUid()\n
+ return context.Baobab_getUserAssignedRootSiteList(user_id=user_id, object=1)[0].getSiteUid()\n
\n
\n
getUserSiteUid = CachingMethod(getUserSiteUid, id=\'Baobab_getUserUserSiteUid\', cache_factory=\'erp5_ui_medium\')\n
Added: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getPreviousState.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getPreviousState.xml?rev=14113&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getPreviousState.xml (added)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getPreviousState.xml Wed Apr 18 17:30:33 2007
@@ -1,0 +1,169 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </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># Get the id of the user which last passed given transition on given workflow.\n
+workflow_item_list = context.Base_getWorkflowHistoryItemList(workflow_id, display=0)\n
+workflow_item_list.reverse()\n
+previous_state = None\n
+found_given_state = 0\n
+for workflow_item in workflow_item_list:\n
+ current_state = workflow_item.getProperty(\'state\')\n
+ context.log(\'current_state\',current_state)\n
+ if current_state == state:\n
+ found_given_state = 1\n
+ continue\n
+ if found_given_state and (current_state != state):\n
+ previous_state = current_state\n
+ break\n
+return previous_state\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>workflow_id, state</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>2</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>workflow_id</string>
+ <string>state</string>
+ <string>_getattr_</string>
+<string>context</string>
+ <string>workflow_item_list</string>
+ <string>None</string>
+ <string>previous_state</string>
+ <string>found_given_state</string>
+ <string>_getiter_</string>
+ <string>workflow_item</string>
+ <string>current_state</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>Base_getPreviousState</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=14113&r1=14112&r2=14113&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision Wed Apr 18 17:30:33 2007
@@ -1,1 +1,1 @@
-199
+201
More information about the Erp5-report
mailing list