Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
9b12adc0
Commit
9b12adc0
authored
Aug 20, 2019
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: Create Certificate Login instead ERP5 Login for Computers and instances
parent
a1bc2c1b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
master/bt5/slapos_cloud/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
...eAllowedContentTypeTemplateItem/allowed_content_types.xml
+2
-0
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_approveRegistration.py
...nterface_workflow/scripts/Computer_approveRegistration.py
+1
-1
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/scripts/RequesterInstance_request.py
...p_interface_workflow/scripts/RequesterInstance_request.py
+4
-4
master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list
...s_cloud/bt/template_portal_type_allowed_content_type_list
+2
-0
No files found.
master/bt5/slapos_cloud/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @
9b12adc0
<allowed_content_type_list>
<portal_type
id=
"Computer"
>
<item>
Certificate Login
</item>
<item>
ERP5 Login
</item>
</portal_type>
<portal_type
id=
"Hosting Subscription Module"
>
...
...
@@ -9,6 +10,7 @@
<item>
Software Installation
</item>
</portal_type>
<portal_type
id=
"Software Instance"
>
<item>
Certificate Login
</item>
<item>
ERP5 Login
</item>
</portal_type>
<portal_type
id=
"Software Instance Module"
>
...
...
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_approveRegistration.py
View file @
9b12adc0
...
...
@@ -7,7 +7,7 @@ computer.edit(
)
erp5_login
=
computer
.
newContent
(
portal_type
=
"
ERP5
Login"
,
portal_type
=
"
Certificate
Login"
,
reference
=
computer
.
getReference
()
)
erp5_login
.
validate
()
...
...
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/scripts/RequesterInstance_request.py
View file @
9b12adc0
...
...
@@ -100,11 +100,11 @@ if (request_software_instance is None):
)
request_software_instance
.
validate
()
if
software_instance_portal_type
==
"Software Instance"
:
# Include
ERP5
Login so Instance become a User
erp5
_login
=
request_software_instance
.
newContent
(
portal_type
=
"
ERP5
Login"
,
# Include
Certificate
Login so Instance become a User
certificate
_login
=
request_software_instance
.
newContent
(
portal_type
=
"
Certificate
Login"
,
reference
=
request_software_instance
.
getReference
())
erp5_login
=
erp5
_login
.
validate
()
certificate
_login
.
validate
()
graph
[
request_software_instance
.
getUid
()]
=
[]
...
...
master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list
View file @
9b12adc0
Computer | Certificate Login
Computer | ERP5 Login
Hosting Subscription Module | Hosting Subscription
Software Installation Module | Software Installation
Software Instance Module | Slave Instance
Software Instance Module | Software Instance
Software Instance | Certificate Login
Software Instance | ERP5 Login
\ 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