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
Thomas Gambier
erp5
Commits
3f46cd13
Commit
3f46cd13
authored
13 years ago
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Typos and remove blank spaces
parent
7b9c2c23
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
25 deletions
+23
-25
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml
...5_credential/CredentialRequest_checkLoginAvailability.xml
+1
-1
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginExistence.xml
...erp5_credential/CredentialRequest_checkLoginExistence.xml
+4
-2
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml
...redential/CredentialRequest_createPersonAndAssignment.xml
+6
-6
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.xml
...al_skins/erp5_credential/CredentialRequest_createUser.xml
+4
-6
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_sendAcceptedNotification.xml
...credential/CredentialRequest_sendAcceptedNotification.xml
+5
-5
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_setRegisteredInformationToPerson.xml
...al/CredentialRequest_setRegisteredInformationToPerson.xml
+0
-1
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml
...5_credential/CredentialRequest_updatePersonAssignment.xml
+2
-3
bt5/erp5_credential/bt/revision
bt5/erp5_credential/bt/revision
+1
-1
No files found.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml
View file @
3f46cd13
...
...
@@ -55,7 +55,7 @@
"""Check login is available locally and globally for instance with SSO.\n
Parameters:\n
value -- field value (string)\n
RE
SQ
EST -- standard REQUEST variable"""\n
RE
QU
EST -- standard REQUEST variable"""\n
\n
def getRealContext():\n
if not REQUEST:\n
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginExistence.xml
View file @
3f46cd13
...
...
@@ -50,8 +50,10 @@
</item>
<item>
<key>
<string>
_body
</string>
</key>
<value>
<string>
"""Check if login exist or not. It\'s the inverse of avaibility"""\n
return not context.ERP5Site_isLocalLoginAvailable(value,REQUEST)\n
<value>
<string>
"""\n
Check if login exist or not. It\'s the inverse of avaibility\n
"""\n
return not context.ERP5Site_isLocalLoginAvailable(value, REQUEST)\n
</string>
</value>
</item>
<item>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml
View file @
3f46cd13
...
...
@@ -67,23 +67,23 @@ if REQUEST is not None:\n
#Create related object, pass a copy of the dict\n
context.CredentialRequest_setDefaultDestinationDecision([x for x in related_portal_type])\n
\n
#Check consistency of the subscription, pass a copy of the dict\n
#
Check consistency of the subscription, pass a copy of the dict\n
context.Credential_checkConsistency([x for x in related_portal_type])\n
\n
#
Fill related object with
credential request\n
#
Fill related object with
credential request\n
for portal_type in related_portal_type:\n
getattr(context,\'CredentialRequest_setRegisteredInformationTo%s\' % portal_type.replace(\' \',\'\'))()\n
\n
#Create assignment\n
#
Create assignment\n
context.CredentialRequest_updatePersonAssignment()\n
\n
#Create account\n
#
Create account\n
login, password = context.CredentialRequest_createUser()\n
\n
#
Update local r
oles\n
#
Update Local R
oles\n
context.CredentialRequest_updateLocalRolesOnSecurityGroups()\n
\n
#Send notification in activities\n
#
Send notification in activities\n
context.activate(activity=\'SQLQueue\').CredentialRequest_sendAcceptedNotification(login,password)\n
</string>
</value>
</item>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.xml
View file @
3f46cd13
...
...
@@ -59,11 +59,11 @@ if REQUEST:\n
\n
person = context.getDestinationDecisionValue(portal_type="Person")\n
\n
#Create user of the person only if not exist\n
#
Create user of the person only if not exist\n
if person.hasReference() and person.getPassword(): \n
return person.getReference(), None\n
\n
#Set login\n
#
Set login\n
login = context.getReference()\n
if not person.hasReference():\n
if not login:\n
...
...
@@ -73,14 +73,12 @@ else:\n
login = person.getReference()\n
\n
password = None\n
#Set password if no password on the person\n
if not person.getPassword() :\n
\n
# Set password if no password on the person\n
if not person.getPassword():\n
if context.getPassword():\n
#User has fill a password\n
password = context.getPassword()\n
person.setEncodedPassword(password)\n
\n
else:\n
#We should generate a password\n
password = context.Person_generatePassword(alpha=5, numeric=3)\n
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_sendAcceptedNotification.xml
View file @
3f46cd13
...
...
@@ -50,12 +50,12 @@
</item>
<item>
<key>
<string>
_body
</string>
</key>
<value>
<string>
"""Send an email (after accept a credential request\n
Proxy: Assignee, Assignor, Member -- allow to send notification by mail"""\n
""""Exemple of notification message\n
Congratulation, the creation of you new Instance Name account \'${login_name}\' is finished.\\nYour password is \'${login_password}\'\\nThank you"))\n
<value>
<string>
"""Send an email after accept a credential request\n
Proxy: Assignee, Assignor, Member -- allow to send notification by mail\n
\n
Congratulation, the creation of you new Instance Name account \'${user_id}\' is finished.\\n\\nThank you",\n
Example of notification message:\n
Congratulation, the creation of you new Instance Name account \'${login_name}\' is finished.\\nYour password is \'${login_password}\'\\nThank you"))\n
Congratulation, the creation of you new Instance Name account \'${user_id}\' is finished.\\n\\nThank you",\n
"""\n
portal = context.getPortalObject()\n
recipient = context.getDestinationDecisionValue(portal_type="Person")\n
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_setRegisteredInformationToPerson.xml
View file @
3f46cd13
...
...
@@ -102,7 +102,6 @@ person_mapping = (\n
\n
context.Credential_copyRegistredInformation(person, person_mapping)\n
\n
\n
#try to validate, can be get error if already validated\n
try:\n
person.validate()\n
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml
View file @
3f46cd13
...
...
@@ -83,16 +83,15 @@ for assignment in open_assignment_list:\n
current_assignment_list[role].append(assignment)\n
else:\n
current_assignment_list[role] = [assignment]\n
\n
\n
organisation_url = organisation is not None and organisation.getRelativeUrl() or None
;
\n
organisation_url = organisation is not None and organisation.getRelativeUrl() or None\n
for role in context.getRoleList():\n
if role in current_assignment_list:\n
#Update assignment\n
for assignment in current_assignment_list[role]:\n
assignment.update()\n
assignment.edit(site = context.getSite(),\n
activity = context.getActivityList(),
\n
activity = context.getActivityList(),\n
function = context.getFunctionList(),\n
destination = organisation_url,\n
stop_date=delay)\n
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_credential/bt/revision
View file @
3f46cd13
355
\ No newline at end of file
356
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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