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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Binh
erp5
Commits
5c480b0b
Commit
5c480b0b
authored
Jun 02, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
credentials: only take into account persons with reference when looking up login from email
also simplify some error messages
parent
4815fa48
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
...redential/ERP5Site_getRelatedCredentialQuestionDialog.xml
+5
-4
bt5/erp5_l10n_fr/MessageTranslationTemplateItem/fr/erp5_ui/translation.po
.../MessageTranslationTemplateItem/fr/erp5_ui/translation.po
+3
-3
bt5/erp5_l10n_fr/bt/revision
bt5/erp5_l10n_fr/bt/revision
+1
-1
No files found.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_getRelatedCredentialQuestionDialog.xml
View file @
5c480b0b
...
@@ -65,7 +65,7 @@ if choice == "password":\n
...
@@ -65,7 +65,7 @@ if choice == "password":\n
portal_preferences = context.portal_preferences\n
portal_preferences = context.portal_preferences\n
result = person_module.searchFolder(reference={\'query\': reference, \'key\': \'ExactMatch\'})\n
result = person_module.searchFolder(reference={\'query\': reference, \'key\': \'ExactMatch\'})\n
if len(result) != 1:\n
if len(result) != 1:\n
portal_status_message = context.Base_translateString("C
an\'t find corresponding person, it\'s not possible to update your credentials
.")\n
portal_status_message = context.Base_translateString("C
ould not find your user account
.")\n
if web_site:\n
if web_site:\n
return web_site.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
return web_site.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
return portal.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
return portal.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
...
@@ -96,12 +96,13 @@ if choice == "password":\n
...
@@ -96,12 +96,13 @@ if choice == "password":\n
elif choice == "username":\n
elif choice == "username":\n
query_kw = {"email.url_string" : default_email_text}\n
query_kw = {"email.url_string" : default_email_text}\n
result = portal.portal_catalog(portal_type="Email", parent_portal_type="Person", **query_kw)\n
result = portal.portal_catalog(portal_type="Email", parent_portal_type="Person", **query_kw)\n
if len(result) == 0:\n
person_list = [x.getParentValue() for x in result]\n
portal_status_message = context.Base_translateString("Can\'t find corresponding person, it\'s not possible to update your credentials.")\n
person_list = [x for x in result if x.getReference()] # only consider persons with a valid login\n
if len(person_list) == 0:\n
portal_status_message = context.Base_translateString("Could not find your user account.")\n
if web_site:\n
if web_site:\n
return web_site.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
return web_site.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
return portal.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
return portal.Base_redirect(\'login_form\', keep_items = dict(portal_status_message=portal_status_message ))\n
person_list = [x.getParentValue() for x in result]\n
return context.ERP5Site_newCredentialRecovery(default_email_text=default_email_text, person_list=person_list)\n
return context.ERP5Site_newCredentialRecovery(default_email_text=default_email_text, person_list=person_list)\n
</string>
</value>
</string>
</value>
</item>
</item>
...
...
bt5/erp5_l10n_fr/MessageTranslationTemplateItem/fr/erp5_ui/translation.po
View file @
5c480b0b
...
@@ -1659,9 +1659,6 @@ msgstr "Impossible de trouver l'organisation correspondant à votre login, il n'
...
@@ -1659,9 +1659,6 @@ msgstr "Impossible de trouver l'organisation correspondant à votre login, il n'
msgid "Can't find corresponding person, it's not possible to reset your password."
msgid "Can't find corresponding person, it's not possible to reset your password."
msgstr "Impossible de trouver la personne correspondant à votre login, il n'est pas possible de réinitialiser votre mot de passe."
msgstr "Impossible de trouver la personne correspondant à votre login, il n'est pas possible de réinitialiser votre mot de passe."
msgid "Can't find corresponding person, it's not possible to update your credentials."
msgstr "Impossible de trouver la personne correspondant à votre login, il n'est pas possible de mettre à jour vos informations."
msgid "Cancel"
msgid "Cancel"
msgstr "Annuler"
msgstr "Annuler"
...
@@ -2661,6 +2658,9 @@ msgstr "Dénomination sociale"
...
@@ -2661,6 +2658,9 @@ msgstr "Dénomination sociale"
msgid "Corporate Registration Code"
msgid "Corporate Registration Code"
msgstr "SIRET"
msgstr "SIRET"
msgid "Could not find your user account."
msgstr "Impossible de trouver votre compte utilisateur."
msgid "Count"
msgid "Count"
msgstr "Nombre"
msgstr "Nombre"
...
...
bt5/erp5_l10n_fr/bt/revision
View file @
5c480b0b
21
2
21
3
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