diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml index 4677e881091bde808a61e98969844c09f6ddb467..9efc6c7b0b64d61686d31d697bf24a21ba62d817 100644 --- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml +++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml @@ -63,7 +63,7 @@ person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n \n version = \'001\'\n language = portal.Localizer.get_selected_language()\n -user_assignment_dict = portal.ERP5Site_getUserAssignmentDict()\n +user_assignment_dict = portal.ERP5Site_getPersonAssignmentDict()\n if group_list in MARKER:\n group_list = user_assignment_dict[\'group_list\']\n if site_list in MARKER:\n diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserAssignmentDict.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserAssignmentDict.xml deleted file mode 100644 index e97d1a88ccd1e8d6967c0d3be42392c49b966b32..0000000000000000000000000000000000000000 --- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserAssignmentDict.xml +++ /dev/null @@ -1,164 +0,0 @@ -<?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>Script_magic</string> </key> - <value> <int>3</int> </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>"""\n - Get user assignment details.\n -"""\n -from Products.ERP5Type.Cache import CachingMethod\n -\n -portal = context.getPortalObject()\n -result = {\'group_list\': [],\n - \'site_list\': [],\n - \'function_list\': [],\n - \'destination_trade_relative_url\': None}\n -person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n -if person is None:\n - return result\n -\n -def getAssignmentDict(username):\n - person = portal.restrictedTraverse(person_relative_url)\n - assignment_list = person.searchFolder(portal_type = \'Assignment\', \\\n - validation_state = \'open\')\n - for assignment in assignment_list:\n - assignment = assignment.getObject()\n - result[\'group_list\'].extend(assignment.getGroupList())\n - result[\'function_list\'].extend(assignment.getFunctionList())\n - result[\'site_list\'].extend(assignment.getSiteList())\n - result[\'destination_trade_relative_url\'] = assignment.getDestinationTradeRelativeUrl()\n - return result\n -\n -person_relative_url = person.getRelativeUrl()\n -getAssignmentDict = CachingMethod(getAssignmentDict,\n - ("ERP5Site_getUserAssignmentDict",),\n - cache_factory=\'erp5_ui_short\')\n -return getAssignmentDict(person_relative_url)\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_proxy_roles</string> </key> - <value> - <tuple> - <string>Manager</string> - </tuple> - </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>Products.ERP5Type.Cache</string> - <string>CachingMethod</string> - <string>_getattr_</string> - <string>context</string> - <string>portal</string> - <string>None</string> - <string>result</string> - <string>person</string> - <string>person_relative_url</string> - <string>getAssignmentDict</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>ERP5Site_getUserAssignmentDict</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_discussion/bt/revision b/bt5/erp5_discussion/bt/revision index 43c451e0c6da52ad30bb605a60c7cb34497f3d30..7c6ba0fe181de786f8f09b1b8cc1ad6bbc1dd5a4 100644 --- a/bt5/erp5_discussion/bt/revision +++ b/bt5/erp5_discussion/bt/revision @@ -1 +1 @@ -54 \ No newline at end of file +55 \ No newline at end of file