Commit 475056e3 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Fix a small typo.

Ignore conflicts in roles.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2398 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e334f2d3
...@@ -747,8 +747,6 @@ class RoleTemplateItem(BaseTemplateItem): ...@@ -747,8 +747,6 @@ class RoleTemplateItem(BaseTemplateItem):
for role in p.__ac_roles__: for role in p.__ac_roles__:
roles[role] = 1 roles[role] = 1
for role in self._archive.keys(): for role in self._archive.keys():
if role in roles:
raise TemplateConflictError, 'the role %s already exists' % role
roles[role] = 1 roles[role] = 1
p.__ac_roles__ = tuple(roles.keys()) p.__ac_roles__ = tuple(roles.keys())
...@@ -772,7 +770,7 @@ class RoleTemplateItem(BaseTemplateItem): ...@@ -772,7 +770,7 @@ class RoleTemplateItem(BaseTemplateItem):
for role in p.__ac_roles__: for role in p.__ac_roles__:
roles[role] = 1 roles[role] = 1
for role in self._archive.keys(): for role in self._archive.keys():
if role in roles and role not in new_role: if role in roles and role not in new_roles:
del roles[role] del roles[role]
p.__ac_roles__ = tuple(roles.keys()) p.__ac_roles__ = tuple(roles.keys())
......
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