From 8ca070009221457f45259eb6fb0b46db1ace9036 Mon Sep 17 00:00:00 2001
From: Alain Takoudjou <alain.takoudjou@nexedi.com>
Date: Wed, 5 Jul 2017 16:56:01 +0000
Subject: [PATCH] slapos_cloud: portal_type 'Certificate Access ID' renamed to
'Certificate Login'
---
...ertificate%20Access%20ID.xml => Certificate%20Login.xml} | 4 ++--
.../workflow_chain_type.xml | 2 +-
...rtificateAccessID_view.xml => CertificateLogin_view.xml} | 6 +++---
.../my_reference.xml | 0
.../my_translated_validation_state_title.xml | 0
.../my_url_string.xml | 0
...essID_viewAsList.xml => CertificateLogin_viewAsList.xml} | 6 +++---
.../listbox.xml | 4 ++--
.../scripts/Computer_generateCertificate.py | 2 +-
.../scripts/Computer_revokeCertificate.py | 2 +-
master/bt5/slapos_cloud/bt/template_action_path_list | 2 +-
.../bt/template_portal_type_allowed_content_type_list | 6 +++---
master/bt5/slapos_cloud/bt/template_portal_type_id_list | 2 +-
.../bt/template_portal_type_property_sheet_list | 4 ++--
.../bt/template_portal_type_workflow_chain_list | 4 ++--
15 files changed, 22 insertions(+), 22 deletions(-)
rename master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/{Certificate%20Access%20ID.xml => Certificate%20Login.xml} (96%)
rename master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/{CertificateAccessID_view.xml => CertificateLogin_view.xml} (95%)
rename master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/{CertificateAccessID_view => CertificateLogin_view}/my_reference.xml (100%)
rename master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/{CertificateAccessID_view => CertificateLogin_view}/my_translated_validation_state_title.xml (100%)
rename master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/{CertificateAccessID_view => CertificateLogin_view}/my_url_string.xml (100%)
rename master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/{CertificateAccessID_viewAsList.xml => CertificateLogin_viewAsList.xml} (95%)
rename master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/{CertificateAccessID_viewAsList => CertificateLogin_viewAsList}/listbox.xml (98%)
diff --git a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20Access%20ID.xml b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20Login.xml
similarity index 96%
rename from master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20Access%20ID.xml
rename to master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20Login.xml
index 5a307c9e4..5284f622e 100644
--- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20Access%20ID.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Certificate%20Login.xml
@@ -39,7 +39,7 @@
</item>
<item>
<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>
<key> <string>factory</string> </key>
@@ -57,7 +57,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Certificate Access ID</string> </value>
+ <value> <string>Certificate Login</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
diff --git a/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 469c86559..4ec7ba541 100644
--- a/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -4,7 +4,7 @@
<workflow>edit_workflow, validation_workflow</workflow>
</chain>
<chain>
- <type>Certificate Access ID</type>
+ <type>Certificate Login</type>
<workflow>edit_workflow, validation_workflow</workflow>
</chain>
<chain>
diff --git a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view.xml b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view.xml
similarity index 95%
rename from master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view.xml
rename to master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view.xml
index 5998729e8..a9545a0fc 100644
--- a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view.xml
+++ b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view.xml
@@ -111,7 +111,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>CertificateAccessID_view</string> </value>
+ <value> <string>CertificateLogin_view</string> </value>
</item>
<item>
<key> <string>method</string> </key>
@@ -119,7 +119,7 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>CertificateAccessID_view</string> </value>
+ <value> <string>CertificateLogin_view</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
@@ -135,7 +135,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Certificate Access ID</string> </value>
+ <value> <string>Certificate Login</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
diff --git a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view/my_reference.xml b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_reference.xml
similarity index 100%
rename from master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view/my_reference.xml
rename to master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_reference.xml
diff --git a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view/my_translated_validation_state_title.xml b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_translated_validation_state_title.xml
similarity index 100%
rename from master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view/my_translated_validation_state_title.xml
rename to master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_translated_validation_state_title.xml
diff --git a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view/my_url_string.xml b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_url_string.xml
similarity index 100%
rename from master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_view/my_url_string.xml
rename to master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_view/my_url_string.xml
diff --git a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_viewAsList.xml b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList.xml
similarity index 95%
rename from master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_viewAsList.xml
rename to master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList.xml
index 490b1c001..c3992d973 100644
--- a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_viewAsList.xml
+++ b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList.xml
@@ -108,7 +108,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>CertificateAccessID_viewAsList</string> </value>
+ <value> <string>CertificateLogin_viewAsList</string> </value>
</item>
<item>
<key> <string>method</string> </key>
@@ -116,7 +116,7 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>Computer_viewCertificateAccessList</string> </value>
+ <value> <string>CertificateLogin_viewAsList</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
@@ -132,7 +132,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Certificate Access IDs</string> </value>
+ <value> <string>Certificate Login IDs</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
diff --git a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_viewAsList/listbox.xml b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList/listbox.xml
similarity index 98%
rename from master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_viewAsList/listbox.xml
rename to master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList/listbox.xml
index 193a01b45..44718764c 100644
--- a/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateAccessID_viewAsList/listbox.xml
+++ b/master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/CertificateLogin_viewAsList/listbox.xml
@@ -129,8 +129,8 @@
<value>
<list>
<tuple>
- <string>Certificate Access ID</string>
- <string>Certificate Access ID</string>
+ <string>Certificate Login</string>
+ <string>Certificate Login</string>
</tuple>
</list>
</value>
diff --git a/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_generateCertificate.py b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_generateCertificate.py
index e627f7168..ead7c3dc8 100644
--- a/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_generateCertificate.py
+++ b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_generateCertificate.py
@@ -7,7 +7,7 @@ try:
except KeyError, 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
computer.contentValues(portal_type=certificate_portal_type)
if x.getValidationState() == 'validated']
diff --git a/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_revokeCertificate.py b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_revokeCertificate.py
index a69238f18..a1cac4dfb 100644
--- a/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_revokeCertificate.py
+++ b/master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/computer_slap_interface_workflow/scripts/Computer_revokeCertificate.py
@@ -2,7 +2,7 @@ computer = state_change['object']
context.REQUEST.set('computer_certificate', None)
context.REQUEST.set('computer_certificate_url', None)
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 not len(certificate_id_list):
diff --git a/master/bt5/slapos_cloud/bt/template_action_path_list b/master/bt5/slapos_cloud/bt/template_action_path_list
index eaad07d71..186e6edd7 100644
--- a/master/bt5/slapos_cloud/bt/template_action_path_list
+++ b/master/bt5/slapos_cloud/bt/template_action_path_list
@@ -1,5 +1,5 @@
Caucase REST Client Interface | view
-Certificate Access ID | view
+Certificate Login | view
Computer Model | view_capacity
Computer Network | view_computer_list
Computer Network | view_software_release
diff --git a/master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list b/master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list
index e49463ecd..c15f6188b 100644
--- a/master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list
+++ b/master/bt5/slapos_cloud/bt/template_portal_type_allowed_content_type_list
@@ -1,7 +1,7 @@
-Computer | Certificate Access ID
+Computer | Certificate Login
Hosting Subscription Module | Hosting Subscription
-Person | Certificate Access ID
+Person | Certificate Login
Software Installation Module | Software Installation
Software Instance Module | Slave Instance
Software Instance Module | Software Instance
-Software Instance | Certificate Access ID
\ No newline at end of file
+Software Instance | Certificate Login
\ No newline at end of file
diff --git a/master/bt5/slapos_cloud/bt/template_portal_type_id_list b/master/bt5/slapos_cloud/bt/template_portal_type_id_list
index e0ef49f24..920badb34 100644
--- a/master/bt5/slapos_cloud/bt/template_portal_type_id_list
+++ b/master/bt5/slapos_cloud/bt/template_portal_type_id_list
@@ -1,5 +1,5 @@
Caucase REST Client Interface
-Certificate Access ID
+Certificate Login
Hosting Subscription
Hosting Subscription Module
Slave Instance
diff --git a/master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list b/master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
index 0ecb05f01..3056a541d 100644
--- a/master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
+++ b/master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
@@ -2,8 +2,8 @@ Assignment | SlaposAssignmentConstraint
Caucase REST Client Interface | Login
Caucase REST Client Interface | RESTClientInterface
Caucase REST Client Interface | Url
-Certificate Access ID | Reference
-Certificate Access ID | Url
+Certificate Login | Reference
+Certificate Login | Url
Computer Model | SlaposCapacity
Computer Partition | ComputerPartition
Computer Partition | SlaposComputerPartitionConstraint
diff --git a/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list b/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list
index 257ad7b36..069c826fa 100644
--- a/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list
+++ b/master/bt5/slapos_cloud/bt/template_portal_type_workflow_chain_list
@@ -1,7 +1,7 @@
Caucase REST Client Interface | edit_workflow
Caucase REST Client Interface | validation_workflow
-Certificate Access ID | edit_workflow
-Certificate Access ID | validation_workflow
+Certificate Login | edit_workflow
+Certificate Login | validation_workflow
Computer Partition | computer_partition_slap_interface_workflow
Computer | computer_slap_interface_workflow
Computer | slapos_cloud_interaction_workflow
--
2.30.9