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
8ca07000
Commit
8ca07000
authored
Jul 05, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: portal_type 'Certificate Access ID' renamed to 'Certificate Login'
parent
072a03a3
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
22 additions
and
22 deletions
+22
-22
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20Login.xml
...rtalTypeTemplateItem/portal_types/Certificate%20Login.xml
+2
-2
master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
...rtalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+1
-1
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view.xml
...eItem/portal_skins/slapos_cloud/CertificateLogin_view.xml
+3
-3
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_reference.xml
...skins/slapos_cloud/CertificateLogin_view/my_reference.xml
+0
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_translated_validation_state_title.xml
...ficateLogin_view/my_translated_validation_state_title.xml
+0
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_url_string.xml
...kins/slapos_cloud/CertificateLogin_view/my_url_string.xml
+0
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList.xml
...portal_skins/slapos_cloud/CertificateLogin_viewAsList.xml
+3
-3
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList/listbox.xml
...kins/slapos_cloud/CertificateLogin_viewAsList/listbox.xml
+2
-2
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_generateCertificate.py
...nterface_workflow/scripts/Computer_generateCertificate.py
+1
-1
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_revokeCertificate.py
..._interface_workflow/scripts/Computer_revokeCertificate.py
+1
-1
master/bt5/slapos_cloud/bt/template_action_path_list
master/bt5/slapos_cloud/bt/template_action_path_list
+1
-1
master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list
...s_cloud/bt/template_portal_type_allowed_content_type_list
+3
-3
master/bt5/slapos_cloud/bt/template_portal_type_id_list
master/bt5/slapos_cloud/bt/template_portal_type_id_list
+1
-1
master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
.../slapos_cloud/bt/template_portal_type_property_sheet_list
+2
-2
master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list
.../slapos_cloud/bt/template_portal_type_workflow_chain_list
+2
-2
No files found.
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20
Access%20ID
.xml
→
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20
Login
.xml
View file @
8ca07000
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string>
Certificate used to authenticate Object in erp5
</string>
</value>
<value>
<string>
Certificate
Login
used to authenticate Object in erp5
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
factory
</string>
</key>
<key>
<string>
factory
</string>
</key>
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Certificate
Access ID
</string>
</value>
<value>
<string>
Certificate
Login
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
init_script
</string>
</key>
<key>
<string>
init_script
</string>
</key>
...
...
master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @
8ca07000
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<workflow>
edit_workflow, validation_workflow
</workflow>
<workflow>
edit_workflow, validation_workflow
</workflow>
</chain>
</chain>
<chain>
<chain>
<type>
Certificate
Access ID
</type>
<type>
Certificate
Login
</type>
<workflow>
edit_workflow, validation_workflow
</workflow>
<workflow>
edit_workflow, validation_workflow
</workflow>
</chain>
</chain>
<chain>
<chain>
...
...
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
AccessID
_view.xml
→
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
Login
_view.xml
View file @
8ca07000
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Certificate
AccessID
_view
</string>
</value>
<value>
<string>
Certificate
Login
_view
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
method
</string>
</key>
<key>
<string>
method
</string>
</key>
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
name
</string>
</key>
<key>
<string>
name
</string>
</key>
<value>
<string>
Certificate
AccessID
_view
</string>
</value>
<value>
<string>
Certificate
Login
_view
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
pt
</string>
</key>
<key>
<string>
pt
</string>
</key>
...
@@ -135,7 +135,7 @@
...
@@ -135,7 +135,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Certificate
Access ID
</string>
</value>
<value>
<string>
Certificate
Login
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
unicode_mode
</string>
</key>
<key>
<string>
unicode_mode
</string>
</key>
...
...
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
AccessID
_view/my_reference.xml
→
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
Login
_view/my_reference.xml
View file @
8ca07000
File moved
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
AccessID
_view/my_translated_validation_state_title.xml
→
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
Login
_view/my_translated_validation_state_title.xml
View file @
8ca07000
File moved
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
AccessID
_view/my_url_string.xml
→
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
Login
_view/my_url_string.xml
View file @
8ca07000
File moved
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
AccessID
_viewAsList.xml
→
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
Login
_viewAsList.xml
View file @
8ca07000
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Certificate
AccessID
_viewAsList
</string>
</value>
<value>
<string>
Certificate
Login
_viewAsList
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
method
</string>
</key>
<key>
<string>
method
</string>
</key>
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
name
</string>
</key>
<key>
<string>
name
</string>
</key>
<value>
<string>
C
omputer_viewCertificateAcces
sList
</string>
</value>
<value>
<string>
C
ertificateLogin_viewA
sList
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
pt
</string>
</key>
<key>
<string>
pt
</string>
</key>
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Certificate
Access
IDs
</string>
</value>
<value>
<string>
Certificate
Login
IDs
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
unicode_mode
</string>
</key>
<key>
<string>
unicode_mode
</string>
</key>
...
...
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
AccessID
_viewAsList/listbox.xml
→
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Certificate
Login
_viewAsList/listbox.xml
View file @
8ca07000
...
@@ -129,8 +129,8 @@
...
@@ -129,8 +129,8 @@
<value>
<value>
<list>
<list>
<tuple>
<tuple>
<string>
Certificate
Access ID
</string>
<string>
Certificate
Login
</string>
<string>
Certificate
Access ID
</string>
<string>
Certificate
Login
</string>
</tuple>
</tuple>
</list>
</list>
</value>
</value>
...
...
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_generateCertificate.py
View file @
8ca07000
...
@@ -7,7 +7,7 @@ try:
...
@@ -7,7 +7,7 @@ try:
except
KeyError
,
e
:
except
KeyError
,
e
:
raise
TypeError
(
"Computer_generateCertificate takes exactly 1 argument: %s"
%
str
(
e
))
raise
TypeError
(
"Computer_generateCertificate takes exactly 1 argument: %s"
%
str
(
e
))
certificate_portal_type
=
"Certificate
Access ID
"
certificate_portal_type
=
"Certificate
Login
"
certificate_id_list
=
[
x
for
x
in
certificate_id_list
=
[
x
for
x
in
computer
.
contentValues
(
portal_type
=
certificate_portal_type
)
computer
.
contentValues
(
portal_type
=
certificate_portal_type
)
if
x
.
getValidationState
()
==
'validated'
]
if
x
.
getValidationState
()
==
'validated'
]
...
...
master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_revokeCertificate.py
View file @
8ca07000
...
@@ -2,7 +2,7 @@ computer = state_change['object']
...
@@ -2,7 +2,7 @@ computer = state_change['object']
context
.
REQUEST
.
set
(
'computer_certificate'
,
None
)
context
.
REQUEST
.
set
(
'computer_certificate'
,
None
)
context
.
REQUEST
.
set
(
'computer_certificate_url'
,
None
)
context
.
REQUEST
.
set
(
'computer_certificate_url'
,
None
)
certificate_id_list
=
[
x
for
x
in
certificate_id_list
=
[
x
for
x
in
computer
.
contentValues
(
portal_type
=
"Certificate
Access ID
"
)
computer
.
contentValues
(
portal_type
=
"Certificate
Login
"
)
if
x
.
getValidationState
()
==
'validated'
]
if
x
.
getValidationState
()
==
'validated'
]
if
not
len
(
certificate_id_list
):
if
not
len
(
certificate_id_list
):
...
...
master/bt5/slapos_cloud/bt/template_action_path_list
View file @
8ca07000
Caucase REST Client Interface | view
Caucase REST Client Interface | view
Certificate
Access ID
| view
Certificate
Login
| view
Computer Model | view_capacity
Computer Model | view_capacity
Computer Network | view_computer_list
Computer Network | view_computer_list
Computer Network | view_software_release
Computer Network | view_software_release
...
...
master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list
View file @
8ca07000
Computer | Certificate
Access ID
Computer | Certificate
Login
Hosting Subscription Module | Hosting Subscription
Hosting Subscription Module | Hosting Subscription
Person | Certificate
Access ID
Person | Certificate
Login
Software Installation Module | Software Installation
Software Installation Module | Software Installation
Software Instance Module | Slave Instance
Software Instance Module | Slave Instance
Software Instance Module | Software Instance
Software Instance Module | Software Instance
Software Instance | Certificate Access ID
Software Instance | Certificate Login
\ No newline at end of file
\ No newline at end of file
master/bt5/slapos_cloud/bt/template_portal_type_id_list
View file @
8ca07000
Caucase REST Client Interface
Caucase REST Client Interface
Certificate
Access ID
Certificate
Login
Hosting Subscription
Hosting Subscription
Hosting Subscription Module
Hosting Subscription Module
Slave Instance
Slave Instance
...
...
master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
View file @
8ca07000
...
@@ -2,8 +2,8 @@ Assignment | SlaposAssignmentConstraint
...
@@ -2,8 +2,8 @@ Assignment | SlaposAssignmentConstraint
Caucase REST Client Interface | Login
Caucase REST Client Interface | Login
Caucase REST Client Interface | RESTClientInterface
Caucase REST Client Interface | RESTClientInterface
Caucase REST Client Interface | Url
Caucase REST Client Interface | Url
Certificate
Access ID
| Reference
Certificate
Login
| Reference
Certificate
Access ID
| Url
Certificate
Login
| Url
Computer Model | SlaposCapacity
Computer Model | SlaposCapacity
Computer Partition | ComputerPartition
Computer Partition | ComputerPartition
Computer Partition | SlaposComputerPartitionConstraint
Computer Partition | SlaposComputerPartitionConstraint
...
...
master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list
View file @
8ca07000
Caucase REST Client Interface | edit_workflow
Caucase REST Client Interface | edit_workflow
Caucase REST Client Interface | validation_workflow
Caucase REST Client Interface | validation_workflow
Certificate
Access ID
| edit_workflow
Certificate
Login
| edit_workflow
Certificate
Access ID
| validation_workflow
Certificate
Login
| validation_workflow
Computer Partition | computer_partition_slap_interface_workflow
Computer Partition | computer_partition_slap_interface_workflow
Computer | computer_slap_interface_workflow
Computer | computer_slap_interface_workflow
Computer | slapos_cloud_interaction_workflow
Computer | slapos_cloud_interaction_workflow
...
...
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