Commit 0eb03bb1 authored by Sebastien Robin's avatar Sebastien Robin

- Make CounterDate_init working even if the user is not assigned to a site...

- Make CounterDate_init working even if the user is not assigned to a site (compatibility with unit test wich are already existing)
- Added again a new parameter to Delivery_getVaultItemList, user_vault

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12602 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a0e66a11
...@@ -68,13 +68,19 @@ ...@@ -68,13 +68,19 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>site = context.Baobab_getVaultSite(context.Baobab_getUserAssignedSiteList()[0])\n <value> <string encoding="cdata"><![CDATA[
site_url = site.getRelativeUrl()\n
context.setSite(site_url)\n user_site_list = context.Baobab_getUserAssignedSiteList()\n
if len(user_site_list)>0:\n
site = context.Baobab_getVaultSite(user_site_list[0])\n
site_url = site.getRelativeUrl()\n
context.setSite(site_url)\n
\n \n
from DateTime import DateTime\n from DateTime import DateTime\n
context.setStartDate(DateTime())\n context.setStartDate(DateTime(DateTime().Date()))\n
</string> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
...@@ -125,6 +131,8 @@ context.setStartDate(DateTime())\n ...@@ -125,6 +131,8 @@ context.setStartDate(DateTime())\n
<string>kw</string> <string>kw</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>user_site_list</string>
<string>len</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>site</string> <string>site</string>
<string>site_url</string> <string>site_url</string>
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
# utilis\xc3\xa9 en m\xc3\xaame temps que leaf_node\n # utilis\xc3\xa9 en m\xc3\xaame temps que leaf_node\n
# with_base = 1 : D\xc3\xa9finie si on renvoie la base categorie \'site\' dans la liste de valeur\n # with_base = 1 : D\xc3\xa9finie si on renvoie la base categorie \'site\' dans la liste de valeur\n
# all = 0 : Affiche aussi entrante/sortante, utile pour les inventaires\n # all = 0 : Affiche aussi entrante/sortante, utile pour les inventaires\n
# user_vault = 0 : Display only subvaults that corresponds to the user assigned vault\n
# first_level = 0 : Ne prend que le premier niveau pour un vault type, meme si les sous categories\n # first_level = 0 : Ne prend que le premier niveau pour un vault type, meme si les sous categories\n
# ont le meme vault_type\n # ont le meme vault_type\n
\n \n
...@@ -217,14 +218,15 @@ if vault_type is None:\n ...@@ -217,14 +218,15 @@ if vault_type is None:\n
else:\n else:\n
assignment_list = None\n assignment_list = None\n
\n \n
user_site_list = []\n
if user_site == 1 or owner_site==1:\n if user_site == 1 or owner_site==1:\n
if owner_site:\n if owner_site:\n
site_list = context.Baobab_getUserAssignedSiteList(user_id=context.owner_info()[\'id\'])\n user_site_list = context.Baobab_getUserAssignedSiteList(user_id=context.owner_info()[\'id\'])\n
elif user_site:\n elif user_site:\n
site_list = context.Baobab_getUserAssignedSiteList()\n user_site_list = context.Baobab_getUserAssignedSiteList()\n
# even if we are on a counter, we can see every thing in the same agency\n # even if we are on a counter, we can see every thing in the same agency\n
new_site_list = []\n new_site_list = []\n
for site in site_list:\n for site in user_site_list:\n
if "guichet" in site:\n if "guichet" in site:\n
site = context.Baobab_getVaultSite(vault=site)\n site = context.Baobab_getVaultSite(vault=site)\n
new_site_list.append(site.getRelativeUrl())\n new_site_list.append(site.getRelativeUrl())\n
...@@ -239,6 +241,7 @@ else:\n ...@@ -239,6 +241,7 @@ else:\n
\n \n
exclude_site_list = None\n exclude_site_list = None\n
if exclude_user_site:\n if exclude_user_site:\n
if len(user_site_list)==0:\n
user_site_list = context.Baobab_getUserAssignedSiteList()\n user_site_list = context.Baobab_getUserAssignedSiteList()\n
new_list = []\n new_list = []\n
for user_site in user_site_list:\n for user_site in user_site_list:\n
...@@ -253,6 +256,14 @@ vault_list = getVaultItemList(vault_type=vault_type, exclude_vault_type=exclude_ ...@@ -253,6 +256,14 @@ vault_list = getVaultItemList(vault_type=vault_type, exclude_vault_type=exclude_
assignment_list=assignment_list, site_list=site_list, with_base=with_base, all=all,\n assignment_list=assignment_list, site_list=site_list, with_base=with_base, all=all,\n
first_level=first_level,main_agency=main_agency,exclude_site_list=exclude_site_list)\n first_level=first_level,main_agency=main_agency,exclude_site_list=exclude_site_list)\n
\n \n
if user_vault == 1:\n
if len(user_site_list)==0:\n
user_site_list = context.Baobab_getUserAssignedSiteList()\n
user_site = user_site_list[0]\n
if user_site.find(\'guichet\')>=0:\n
new_vault_list = [x for x in vault_list if x[1].startswith(user_site)]\n
vault_list = new_vault_list\n
\n
if current_url != None :\n if current_url != None :\n
if \'site\' not in current_url:\n if \'site\' not in current_url:\n
current_url = \'site/\'+current_url\n current_url = \'site/\'+current_url\n
...@@ -290,7 +301,7 @@ return [(\'\', \'\')] + list(vault_list)\n ...@@ -290,7 +301,7 @@ return [(\'\', \'\')] + list(vault_list)\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>vault_type=None, exclude_vault_type=None, current_url=None, user_site=1, leaf_node=1, strict_membership=0, with_base=1, all=0, base_site=None, owner_site=0,first_level=0,main_agency=0,exclude_user_site=0</string> </value> <value> <string>vault_type=None, exclude_vault_type=None, current_url=None, user_site=1, leaf_node=1, strict_membership=0, with_base=1, all=0, base_site=None, owner_site=0,first_level=0,main_agency=0,exclude_user_site=0,user_vault=0</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -318,7 +329,7 @@ return [(\'\', \'\')] + list(vault_list)\n ...@@ -318,7 +329,7 @@ return [(\'\', \'\')] + list(vault_list)\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>13</int> </value> <value> <int>14</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -337,6 +348,7 @@ return [(\'\', \'\')] + list(vault_list)\n ...@@ -337,6 +348,7 @@ return [(\'\', \'\')] + list(vault_list)\n
<string>first_level</string> <string>first_level</string>
<string>main_agency</string> <string>main_agency</string>
<string>exclude_user_site</string> <string>exclude_user_site</string>
<string>user_vault</string>
<string>Products.ERP5Type.Cache</string> <string>Products.ERP5Type.Cache</string>
<string>CachingMethod</string> <string>CachingMethod</string>
<string>None</string> <string>None</string>
...@@ -344,22 +356,23 @@ return [(\'\', \'\')] + list(vault_list)\n ...@@ -344,22 +356,23 @@ return [(\'\', \'\')] + list(vault_list)\n
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>assignment_list</string> <string>assignment_list</string>
<string>user_site_list</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>site_list</string>
<string>new_site_list</string> <string>new_site_list</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>site</string> <string>site</string>
<string>site_list</string>
<string>exclude_site_list</string> <string>exclude_site_list</string>
<string>user_site_list</string> <string>len</string>
<string>new_list</string> <string>new_list</string>
<string>root_site_url</string> <string>root_site_url</string>
<string>vault_list</string> <string>vault_list</string>
<string>current_category</string>
<string>append</string> <string>append</string>
<string>$append0</string> <string>$append0</string>
<string>x</string> <string>x</string>
<string>new_vault_list</string>
<string>current_category</string>
<string>logical_path_list</string> <string>logical_path_list</string>
<string>len</string>
<string>title</string> <string>title</string>
<string>list</string> <string>list</string>
</tuple> </tuple>
...@@ -387,6 +400,7 @@ return [(\'\', \'\')] + list(vault_list)\n ...@@ -387,6 +400,7 @@ return [(\'\', \'\')] + list(vault_list)\n
<int>0</int> <int>0</int>
<int>0</int> <int>0</int>
<int>0</int> <int>0</int>
<int>0</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
124 127
\ No newline at end of file \ No newline at end of file
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