From 7110bf229c397ba9b1fe03a63ee5f07eed8d0d8f Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 9 Jan 2008 16:32:43 +0000
Subject: [PATCH] Do not propose to user to add new objects, if he doesn't have
the permission to do it. This should not have impact on performance, as this
menu is rarely displayed.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18644 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Form/MultiRelationField.py | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/product/ERP5Form/MultiRelationField.py b/product/ERP5Form/MultiRelationField.py
index 290db2d936..df5cc9ac81 100644
--- a/product/ERP5Form/MultiRelationField.py
+++ b/product/ERP5Form/MultiRelationField.py
@@ -39,6 +39,8 @@ from types import StringType
from zLOG import LOG
from Products.Formulator.DummyField import fields
from Globals import get_request
+from AccessControl import Unauthorized
+from AccessControl import getSecurityManager
# Max. number of catalog result
MAX_SELECT = 30
@@ -707,16 +709,24 @@ class MultiRelationStringFieldValidator(Validator.LinesValidator):
menu_item_list.append(('', ''))
# If the length is 0, raise an error
if field.get_value('allow_creation') == 1 :
+ user = getSecurityManager().getUser()
+ getDefaultModule = field.getDefaultModule
# XXX
for portal_type in portal_type_list:
- translated_portal_type = Message(domain='erp5_ui',
- message=portal_type)
- message = Message(
- domain='erp5_ui', message='New ${portal_type}',
- mapping={'portal_type': translated_portal_type})
- menu_item_list.append((message,
- '%s%s' % (NEW_CONTENT_PREFIX,
- portal_type)))
+ try:
+ module = getDefaultModule(portal_type)
+ except ValueError:
+ pass
+ else:
+ if portal_type in module.getVisibleAllowedContentTypeList():
+ translated_portal_type = Message(domain='erp5_ui',
+ message=portal_type)
+ message = Message(
+ domain='erp5_ui', message='New ${portal_type}',
+ mapping={'portal_type': translated_portal_type})
+ menu_item_list.append((message,
+ '%s%s' % (NEW_CONTENT_PREFIX,
+ portal_type)))
REQUEST.set(relation_item_id, menu_item_list)
raising_error_needed = 1
raising_error_value = 'relation_result_empty'
--
2.30.9