Skip to content

erp5
erp5
Commit 323560c2 authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

Better support of function (display the functions which are in the range... 

Better support of function (display the functions which are in the range defined in the subordinated organisation). Added support of activity on Person. Rename description as description.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15655 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5418782f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 771 additions and 4 deletions
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_getFunctionItemList.xml 0 → 100644
View file @ 323560c2
<?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>
<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>"""\n
Returns a list of function wich are defined in the subordinated organisation if any\n
and extend it with all possible functions.\n
"""\n
\n
result = []\n
if context.getSubordination():\n
subordination_value = context.getSubordinationValue()\n
if subordination_value is not None:\n
if subordination_value.getFunction():\n
function_value = subordination_value.getFunctionValue()\n
if function_value is not None:\n
result.extend(function_value.getCategoryChildCompactLogicalPathItemList(filter_node=1))\n
\n
result.extend(context.portal_categories.function.getCategoryChildCompactLogicalPathItemList(filter_node=1))\n
\n
return result\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>_params</string> </key>
<value> <string></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>result</string>
<string>_getattr_</string>
<string>context</string>
<string>subordination_value</string>
<string>None</string>
<string>function_value</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>Career_getFunctionItemList</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml
View file @ 323560c2
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
<string>my_role</string> <string>my_role</string>
<string>my_grade</string> <string>my_grade</string>
<string>my_function</string> <string>my_function</string>
<string>my_activity</string>
<string>my_start_date</string> <string>my_start_date</string>
<string>my_stop_date</string> <string>my_stop_date</string>
</list> </list>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_function.xml
View file @ 323560c2
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:here.portal_categories.function.getCategoryChildLogicalPathItemList(filter_node=1)</string> </value> <value> <string>python:(here.getSubordination() and here.getSubordinationValue().getFunction() and here.getSubordinationValue().getFunctionValue()).getCategoryChildLogicalPathItemList(filter_node=1) + here.portal_categories.function.getCategoryChildLogicalPathItemList(filter_node=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_description.xml
View file @ 323560c2
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_description</string> </value> <value> <string>my_description</string> </value>
...@@ -263,7 +269,7 @@ ...@@ -263,7 +269,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Comments</string> </value> <value> <string>Description</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/my_career_function.xml
View file @ 323560c2
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_career_function</string> </value> <value> <string>my_career_function</string> </value>
...@@ -281,7 +287,7 @@ ...@@ -281,7 +287,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>here/portal_categories/function/getCategoryChildCompactLogicalPathItemList</string> </value> <value> <string>here/Career_getFunctionItemList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile.xml
View file @ 323560c2
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<string>my_career_role</string> <string>my_career_role</string>
<string>my_career_grade</string> <string>my_career_grade</string>
<string>my_career_function</string> <string>my_career_function</string>
<string>my_career_activity</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewProfile/my_career_function.xml
View file @ 323560c2
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_career_function</string> </value> <value> <string>my_career_function</string> </value>
...@@ -281,7 +287,7 @@ ...@@ -281,7 +287,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>here/portal_categories/function/getCategoryChildCompactLogicalPathItemList</string> </value> <value> <string>here/Career_getFunctionItemList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
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