Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xueyun Qian
erp5
Commits
036b1b64
Commit
036b1b64
authored
Jan 12, 2017
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
authentication: fixup renaming of Person_unblockLogin -> Login_unblockLogin
parent
a64dc42d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
12 deletions
+13
-12
bt5/erp5_authentication_policy/ActionTemplateItem/portal_types/ERP5%20Login/unblock_user_login.xml
...lateItem/portal_types/ERP5%20Login/unblock_user_login.xml
+1
-1
bt5/erp5_authentication_policy/SkinTemplateItem/portal_skins/erp5_authentication_policy/SystemEventModule_getBlockedUserLoginList.py
...ation_policy/SystemEventModule_getBlockedUserLoginList.py
+10
-9
bt5/erp5_authentication_policy/SkinTemplateItem/portal_skins/erp5_authentication_policy/SystemEventModule_viewBlockUseLoginList/listbox_unblockHTML.xml
...EventModule_viewBlockUseLoginList/listbox_unblockHTML.xml
+1
-1
bt5/erp5_authentication_policy/bt/template_action_path_list
bt5/erp5_authentication_policy/bt/template_action_path_list
+1
-1
No files found.
bt5/erp5_authentication_policy/ActionTemplateItem/portal_types/
Perso
n/unblock_user_login.xml
→
bt5/erp5_authentication_policy/ActionTemplateItem/portal_types/
ERP5%20Logi
n/unblock_user_login.xml
View file @
036b1b64
...
...
@@ -75,7 +75,7 @@
<dictionary>
<item>
<key>
<string>
text
</string>
</key>
<value>
<string>
string:${object_url}/
Perso
n_unblockLogin
</string>
</value>
<value>
<string>
string:${object_url}/
Logi
n_unblockLogin
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
bt5/erp5_authentication_policy/SkinTemplateItem/portal_skins/erp5_authentication_policy/SystemEventModule_getBlockedUserLoginList.py
View file @
036b1b64
...
...
@@ -23,18 +23,19 @@ kw = {'portal_type': 'Authentication Event',
'validation_state'
:
'confirmed'
}
failure_list
=
portal
.
portal_catalog
(
**
kw
)
for
failure
in
failure_list
:
perso
n
=
failure
.
getDestinationValue
()
if
perso
n
not
in
all_blocked_user_login_dict
.
keys
():
all_blocked_user_login_dict
[
perso
n
]
=
[]
all_blocked_user_login_dict
[
perso
n
].
append
(
failure
)
logi
n
=
failure
.
getDestinationValue
()
if
logi
n
not
in
all_blocked_user_login_dict
.
keys
():
all_blocked_user_login_dict
[
logi
n
]
=
[]
all_blocked_user_login_dict
[
logi
n
].
append
(
failure
)
# leave only ones that are blocked:
for
perso
n
,
failure_list
in
all_blocked_user_login_dict
.
items
():
for
logi
n
,
failure_list
in
all_blocked_user_login_dict
.
items
():
if
len
(
failure_list
)
>=
max_authentication_failures
:
person
=
login
.
getParentValue
()
blocked_user_login_list
.
append
(
newTempBase
(
portal
,
person
.
getTitle
(),
**
{
'title'
:
person
.
getTitle
(),
'count'
:
len
(
failure_list
),
'reference'
:
person
.
Person_getUserId
(),
'url'
:
perso
n
.
absolute_url
()}))
'reference'
:
login
.
getReference
(),
'url'
:
logi
n
.
absolute_url
()}))
return
blocked_user_login_list
bt5/erp5_authentication_policy/SkinTemplateItem/portal_skins/erp5_authentication_policy/SystemEventModule_viewBlockUseLoginList/listbox_unblockHTML.xml
View file @
036b1b64
...
...
@@ -127,7 +127,7 @@
<key>
<string>
_text
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
python: \'<a title="Click to unblock login" href="%s/
Perso
n_unblockLogin?cancel_url=%s">
Unblock
</a>
\' %(cell.url, here.absolute_url())
python: \'<a title="Click to unblock login" href="%s/
Logi
n_unblockLogin?cancel_url=%s">
Unblock
</a>
\' %(cell.url, here.absolute_url())
]]>
</string>
</value>
</item>
...
...
bt5/erp5_authentication_policy/bt/template_action_path_list
View file @
036b1b64
Perso
n | unblock_user_login
ERP5 Logi
n | unblock_user_login
System Preference | authentication_policy
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment