Skip to content

S
slapos.core
Commit 19ad395f authored by Romain Courteaud's avatar Romain Courteaud 🐙
Browse files
Options

XXX slapos_erp5: fixup rebase 

TODO: drop original change, and let tests report errors
parent b4287f56
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 254 deletions
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSCodingStyle.py
View file @ 19ad395f
...@@ -83,10 +83,9 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -83,10 +83,9 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_cloud/ComputeNode_getUsageReportUrl', 'slapos_cloud/ComputeNode_getUsageReportUrl',
'slapos_cloud/ComputeNode_init', 'slapos_cloud/ComputeNode_init',
'slapos_cloud/InstanceNode_init', 'slapos_cloud/InstanceNode_init',
'slapos_cloud/InstanceTree_updateParameterAndRequest',
'slapos_cloud/RemoteNode_init', 'slapos_cloud/RemoteNode_init',
'slapos_cloud/ComputePartition_getAvailableSoftwareReleaseUrlStringList', 'slapos_cloud/ComputePartition_getAvailableSoftwareReleaseUrlStringList',
'slapos_cloud/ComputePartition_getInstanceTreeUrlString',
'slapos_cloud/ComputePartition_getInstanceUrlString',
'slapos_cloud/ComputePartition_getLastestContactedDate', 'slapos_cloud/ComputePartition_getLastestContactedDate',
'slapos_cloud/ComputePartition_getOwnerName', 'slapos_cloud/ComputePartition_getOwnerName',
'slapos_cloud/ComputePartition_getRelatedImageAbsoluteUrl', 'slapos_cloud/ComputePartition_getRelatedImageAbsoluteUrl',
...@@ -114,21 +113,11 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -114,21 +113,11 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_cloud/SoftwareInstance_checkDuplicationOnInstanceTreeConsistency', 'slapos_cloud/SoftwareInstance_checkDuplicationOnInstanceTreeConsistency',
'slapos_cloud/ComputerNetwork_getRelatedSoftwareReleaseList', 'slapos_cloud/ComputerNetwork_getRelatedSoftwareReleaseList',
'slapos_crm_monitoring/SupportRequest_afterNewEvent', 'slapos_crm_monitoring/SupportRequest_afterNewEvent',
'slapos_crm_monitoring/ComputeNode_checkInstanceOnCloseAllocation',
'slapos_crm_monitoring/SupportRequestModule_exportMonitoringOPMLDescriptionList',
'slapos_crm_monitoring/SupportRequestModule_getInstanceMessageList',
'slapos_crm_monitoring/SupportRequestModule_getMonitoringOPMLDescriptionList',
'slapos_crm_monitoring/SupportRequest_checkSuspendedToReopen',
'slapos_crm_monitoring/SupportRequest_getInstanceMessageList',
'slapos_crm_monitoring/SupportRequest_getInstanceMonitorUrl',
'slapos_crm_monitoring/SupportRequest_getMonitorUrl',
'slapos_crm_monitoring/SupportRequest_recheckMonitoring',
'slapos_crm_monitoring/Event_checkCustomerAsSourceOrDestinationConsistency',
'slapos_crm_monitoring/SupportRequest_getLastEvent',
'slapos_crm_monitoring/Project_createSupportRequestWithCausality',
'slapos_crm/RegularisationRequest_afterClone', 'slapos_crm/RegularisationRequest_afterClone',
'slapos_crm/RegularisationRequest_getResourceItemList', 'slapos_crm/RegularisationRequest_getResourceItemList',
'slapos_crm/RegularisationRequest_init', 'slapos_crm/RegularisationRequest_init',
'slapos_erp5/CategoryTool_checkRegionMigrationConsistency',
'slapos_erp5/Category_updateRelatedRegionAndExpire',
'slapos_pdm/UpgradeDecision_afterClone', 'slapos_pdm/UpgradeDecision_afterClone',
'slapos_pdm/UpgradeDecision_getResourceItemList', 'slapos_pdm/UpgradeDecision_getResourceItemList',
'slapos_pdm/UpgradeDecision_init', 'slapos_pdm/UpgradeDecision_init',
...@@ -152,6 +141,7 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -152,6 +141,7 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_accounting/Base_getAccountForUse', 'slapos_accounting/Base_getAccountForUse',
'slapos_accounting/Entity_createPaymentTransactionAction', 'slapos_accounting/Entity_createPaymentTransactionAction',
'slapos_accounting/Movement_getPriceCalculationOperandDict', 'slapos_accounting/Movement_getPriceCalculationOperandDict',
'slapos_accounting/PaymentTransaction_acceptDepositPayment',
'slapos_accounting/PaymentTransaction_getExternalPaymentId', 'slapos_accounting/PaymentTransaction_getExternalPaymentId',
'slapos_accounting/PaymentTransaction_postOrderBuild', 'slapos_accounting/PaymentTransaction_postOrderBuild',
'slapos_accounting/SaleInvoiceTransaction_getBaseCategoryDictForPrintout', 'slapos_accounting/SaleInvoiceTransaction_getBaseCategoryDictForPrintout',
...@@ -188,59 +178,6 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -188,59 +178,6 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_upgrader/Base_getUpgradeBusinessTemplateList', 'slapos_upgrader/Base_getUpgradeBusinessTemplateList',
'slapos_upgrader/ERP5Site_upgradeERP5CoreBusinessTemplate', 'slapos_upgrader/ERP5Site_upgradeERP5CoreBusinessTemplate',
'slapos_upgrader/ERP5Site_upgradeUpgraderBusinessTemplate', 'slapos_upgrader/ERP5Site_upgradeUpgraderBusinessTemplate',
'slapos_rss_style/SubscriptionRequest_getRSSDescription',
'slapos_rss_style/WebSection_getLegacyMessageList',
'slapos_hal_json_style/AccountingTransaction_getPaymentStateAsHateoas',
'slapos_hal_json_style/AcknowledgementTool_getUserUnreadAcknowledgementValueList',
'slapos_hal_json_style/Base_getComputerToken',
'slapos_hal_json_style/Base_getContextualHelpList',
'slapos_hal_json_style/Base_getCriticalFeedUrl',
'slapos_hal_json_style/Base_getFeedUrl',
'slapos_hal_json_style/Base_getInvitationLink',
'slapos_hal_json_style/Base_getNewsDictFromComputeNodeList',
'slapos_hal_json_style/Base_getOpenComputeNodeList',
'slapos_hal_json_style/Category_getCategoryChildTranslatedCompactTitleItemListAsJSON',
'slapos_hal_json_style/Document_getNewsDict',
'slapos_hal_json_style/ERP5Site_callbackFacebookLogin',
'slapos_hal_json_style/ERP5Site_receiveGoogleCallback',
'slapos_hal_json_style/Event_getAcknowledgementDict',
'slapos_hal_json_style/InstanceTree_getConnectionParameterList',
'slapos_hal_json_style/InstanceTree_getMonitorParameterDict',
'slapos_hal_json_style/Item_getCurrentProjectTitle',
'slapos_hal_json_style/Item_getCurrentSiteTitle',
'slapos_hal_json_style/Login_edit',
'slapos_hal_json_style/Organisation_acceptInvitation',
'slapos_hal_json_style/Organisation_closeRelatedAssignment',
'slapos_hal_json_style/Organisation_getAssociatedPersonList',
'slapos_hal_json_style/Organisation_hasItem',
'slapos_hal_json_style/PasswordTool_changeUserPassword',
'slapos_hal_json_style/Person_getAssignmentDestinationList',
'slapos_hal_json_style/Person_getCloudContractRelated',
'slapos_hal_json_style/Person_requestComputeNode',
'slapos_hal_json_style/Person_requestComputer',
'slapos_hal_json_style/Person_requestHateoasInstanceTree',
'slapos_hal_json_style/Person_requestSupport',
'slapos_hal_json_style/Project_acceptInvitation',
'slapos_hal_json_style/Project_closeRelatedAssignment',
'slapos_hal_json_style/Project_hasItem',
'slapos_hal_json_style/Document_isRequesterOrOwner',
'slapos_hal_json_style/Project_getComputeNodeTrackingList',
'slapos_hal_json_style/SaleInvoiceTransaction_getRelatedInstanceTreeReportLineList',
'slapos_hal_json_style/SaleInvoiceTransaction_getRelatedPaymentTransactionIntegrationId',
'slapos_hal_json_style/SoftwareInstallation_getSoftwareReleaseInformation',
'slapos_hal_json_style/SoftwareInstance_getReportedState',
'slapos_hal_json_style/SoftwareRelease_requestInstanceTree',
'slapos_hal_json_style/SoftwareRelease_requestSoftwareInstallation',
'slapos_hal_json_style/SupportRequest_close',
'slapos_hal_json_style/Ticket_getResourceItemListAsJSON',
'slapos_hal_json_style/WebSection_getDocumentValue',
'slapos_hal_json_style/WebSection_getLoginWarningMessage',
'slapos_hal_json_style/Ticket_requestEvent',
'slapos_hal_json_style/ComputerNetwork_getComputeNodeList',
'slapos_hal_json_style/Base_getStatusMonitorUrl',
'slapos_administration/ActivityTool_getDateForActivityMessage',
'slapos_administration/ActivityTool_zGetDateForSQLDictMessage',
'slapos_administration/ActivityTool_zGetDateForSQLQueueMessage',
'slapos_administration/Base_checkStoredBrokenState', 'slapos_administration/Base_checkStoredBrokenState',
'slapos_administration/ERP5Site_cleanUnusedSecurityUid', 'slapos_administration/ERP5Site_cleanUnusedSecurityUid',
'slapos_administration/ERP5Site_getSecurityUidStat', 'slapos_administration/ERP5Site_getSecurityUidStat',
...@@ -267,35 +204,6 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -267,35 +204,6 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_base/Login_notifyPasswordExpire', 'slapos_base/Login_notifyPasswordExpire',
'slapos_base/Person_applyContractInvitation', 'slapos_base/Person_applyContractInvitation',
'slapos_erp5/CertificateAuthorityTool_checkCertificateAuthorityConsistency', 'slapos_erp5/CertificateAuthorityTool_checkCertificateAuthorityConsistency',
'slapos_erp5/CatalogTool_checkNoneCreationDateConsistency',
'slapos_erp5/CertificateAuthorityTool_checkSlapOSMachineNonExistenceConsistency',
'slapos_erp5/CertificateAuthorityTool_checkSlapOSPASConsistency',
'slapos_erp5/Module_checkSlapOSModuleIdGeneratorConsistency',
'slapos_erp5/OAuthTool_checkFacebookConnectorExistenceConsistency',
'slapos_erp5/OAuthTool_checkGoogleConnectorExistenceConsistency',
'slapos_erp5/WebSiteModule_checkShacacheConstraint',
'slapos_erp5/SystemPreference_checkConversionServerConsistency',
'slapos_erp5/SystemPreference_checkSystemPreferenceConsistency',
'slapos_jio_api_cache/Base_postAsJSONResultToActiveProcess',
'slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionInstanceList',
'slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionObjectList',
'slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionSoftwareAndComputeList',
'slapos_jio_api_cache/ComputeNode_calculatejIOAPIRevisionHash',
'slapos_jio_api_cache/SlapOSNode_aggregateHashFile',
'slapos_jio_api_cache/SlapOSNode_generateHashFile',
'slapos_jio_api_cache/SoftwareInstallation_calculatejIOAPIRevisionHash',
'slapos_jio_api_cache/SoftwareInstance_calculatejIOAPIRevisionHash',
'slapos_jio_api/ComputeNode_approveComputer',
'slapos_jio_api/ComputeNode_updateFromAPIDict',
'slapos_jio_api/SoftwareInstallation_updateFromDict',
'slapos_jio_api/SoftwareInstanceCertificateRecord_getSoftwareInstanceCertificatesAsJSON',
'slapos_jio_api/SoftwareInstance_updateFromDict',
'slapos_jio_api/jIOWebSection_createComputeNode',
'slapos_jio_api/jIOWebSection_createSoftwareInstallation',
'slapos_jio_api/jIOWebSection_getObjectFromData',
'slapos_jio_api/jIOWebSection_requestSoftwareInstance',
'slapos_jio_api/jIOWebSection_searchComputeNode',
'slapos_jio_api/jIOWebSection_searchHashDocumentRecord',
'slapos_panel_compatibility/Base_getComputerToken', 'slapos_panel_compatibility/Base_getComputerToken',
'slapos_panel_compatibility/Person_requestComputer', 'slapos_panel_compatibility/Person_requestComputer',
'slapos_panel/AllocationSupply_invalidateComputeNodeList', 'slapos_panel/AllocationSupply_invalidateComputeNodeList',
...@@ -303,6 +211,7 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -303,6 +211,7 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_panel/Base_addSlapOSSupportRequest', 'slapos_panel/Base_addSlapOSSupportRequest',
'slapos_panel/Base_getAuthenticatedPersonUid', 'slapos_panel/Base_getAuthenticatedPersonUid',
'slapos_panel/Base_getNewsDictFromComputeNodeList', 'slapos_panel/Base_getNewsDictFromComputeNodeList',
'slapos_panel/Base_getPaymentModeForCurrency',
'slapos_panel/Base_getStatusMonitorUrl', 'slapos_panel/Base_getStatusMonitorUrl',
'slapos_panel/Base_hasSlapOSProjectUserGroup', 'slapos_panel/Base_hasSlapOSProjectUserGroup',
'slapos_panel/CertificateLogin_invalidateOnSlaposPanel', 'slapos_panel/CertificateLogin_invalidateOnSlaposPanel',
...@@ -314,11 +223,15 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -314,11 +223,15 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_panel/ComputerNetwork_getNewsDict', 'slapos_panel/ComputerNetwork_getNewsDict',
'slapos_panel/ComputerNetwork_invalidateOnSlaposPanel', 'slapos_panel/ComputerNetwork_invalidateOnSlaposPanel',
'slapos_panel/Document_getNewsDict', 'slapos_panel/Document_getNewsDict',
'slapos_panel/Event_getAttachmentList',
'slapos_panel/Event_getSafeSourceTitle', 'slapos_panel/Event_getSafeSourceTitle',
'slapos_panel/Event_getUnsafeSourceTitle',
'slapos_panel/InstanceNode_addSlapOSAllocationSupply', 'slapos_panel/InstanceNode_addSlapOSAllocationSupply',
'slapos_panel/InstanceTreeModule_selectRequestProject', 'slapos_panel/InstanceTreeModule_selectRequestProject',
'slapos_panel/InstanceTree_redirectToManualDepositPayment',
'slapos_panel/InstanceTree_addSlapOSInstanceNode', 'slapos_panel/InstanceTree_addSlapOSInstanceNode',
'slapos_panel/InstanceTree_getConnectionParameterList', 'slapos_panel/InstanceTree_getConnectionParameterList',
'slapos_panel/InstanceTree_getMonitorParameterDict',
'slapos_panel/InstanceTree_getNewsDict', 'slapos_panel/InstanceTree_getNewsDict',
'slapos_panel/InstanceTree_requestDestroy', 'slapos_panel/InstanceTree_requestDestroy',
'slapos_panel/InstanceTree_requestPerson', 'slapos_panel/InstanceTree_requestPerson',
...@@ -345,28 +258,45 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -345,28 +258,45 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_panel/SoftwareInstallation_getNewsDict', 'slapos_panel/SoftwareInstallation_getNewsDict',
'slapos_panel/SoftwareInstallation_getSoftwareReleaseInformation', 'slapos_panel/SoftwareInstallation_getSoftwareReleaseInformation',
'slapos_panel/SoftwareInstallation_requestDestruction', 'slapos_panel/SoftwareInstallation_requestDestruction',
'slapos_panel/SoftwareInstance_getAllocableNodeList',
'slapos_panel/SoftwareInstance_getAllocationInformation', 'slapos_panel/SoftwareInstance_getAllocationInformation',
'slapos_panel/SoftwareInstance_getConnectionParameterList', 'slapos_panel/SoftwareInstance_getConnectionParameterList',
'slapos_panel/SoftwareInstance_getNewsDict', 'slapos_panel/SoftwareInstance_getNewsDict',
'slapos_panel/SoftwareProduct_addSlapOSSoftwareRelease', 'slapos_panel/SoftwareProduct_addSlapOSSoftwareRelease',
'slapos_panel/SoftwareProduct_addSlapOSSoftwareType',
'slapos_panel/SubscriptionRequest_changeSlaposSubmittedPrice',
'slapos_panel/SubscriptionRequest_jumpToPaymentPage',
'slapos_panel/Ticket_addSlapOSEvent', 'slapos_panel/Ticket_addSlapOSEvent',
'slapos_panel/Ticket_closeSlapOS', 'slapos_panel/Ticket_closeSlapOS',
'slapos_panel/Ticket_suspendSlapOS',
'slapos_panel/AccountingTransactionModule_getCreateExternalPaymentTransactionList',
'slapos_panel/AccountingTransactionModule_testCreateExternalPaymentTransactionPending',
'slapos_panel/Base_getExternalPaymentTransactionUrl',
'slapos_panel/Base_getSupportedExternalPaymentList',
'slapos_panel/Base_isExternalPaymentConfigured',
'slapos_panel/InstanceTree_getCreateDirectDepositPaymentTransactionList',
'slapos_panel/InstanceTree_testCreateDirectDepositPaymentTransaction',
'slapos_panel/UpgradeDecision_acceptOnSlaposPanel', 'slapos_panel/UpgradeDecision_acceptOnSlaposPanel',
'slapos_panel/UpgradeDecision_rejectOnSlaposPanel', 'slapos_panel/UpgradeDecision_rejectOnSlaposPanel',
'slapos_panel/AccountingTransactionModule_getCreateExternalPaymentTransactionOnSlaposPanelHTML', 'slapos_panel/SaleInvoiceTransaction_getInvoicePrintoutUrl',
'slapos_panel/InstanceTree_proposeUpgradeDecision', 'slapos_panel/InstanceTree_proposeUpgradeDecision',
'slapos_panel/InstanceTree_searchUpgradableSoftwareReleaseList', 'slapos_panel/InstanceTree_searchUpgradableSoftwareReleaseList',
'slapos_panel/PaymentTransaction_triggerPaymentCheckAlarmAndRedirectToPanel', 'slapos_panel/PaymentTransaction_triggerPaymentCheckAlarmAndRedirectToPanel',
'slapos_panel/SaleInvoiceTransaction_createExternalPaymentTransactionFromAmountAndRedirect', 'slapos_panel/ComputePartition_getInstanceTreeUrlString',
'slapos_panel/ComputePartition_getInstanceUrlString',
'slapos_panel/ComputePartition_getOwnerUrl',
'slapos_panel/SoftwareInstance_getComputeNodeUrl',
'slapos_panel_compatibility/Base_getComputerToken', 'slapos_panel_compatibility/Base_getComputerToken',
'slapos_web_renderjs_ui/ERP5Site_callbackFacebookLogin', 'slapos_parameter_editor/SoftwareProductModule_updateParameterEditorTestDialog',
'slapos_web_renderjs_ui/ERP5Site_receiveGoogleCallback', 'slapos_parameter_editor/SoftwareProductModule_validateParameterEditorTestDialog',
'slapos_parameter_editor/SoftwareProductModule_validateSoftwareReleaseForParameterEditorTestDialog',
'slapos_web_renderjs_ui/PasswordTool_changeUserPassword', 'slapos_web_renderjs_ui/PasswordTool_changeUserPassword',
'slapos_web_renderjs_ui/WebSection_getDocumentValue', 'slapos_web_renderjs_ui/WebSection_getDocumentValue',
'slapos_web_renderjs_ui/WebSection_getLoginWarningMessage', 'slapos_web_renderjs_ui/WebSection_getLoginWarningMessage',
'slapos_subscription_request/SubscriptionRequest_createOpenSaleOrder', 'slapos_subscription_request/SubscriptionRequest_createOpenSaleOrder',
'slapos_subscription_request/SubscriptionRequest_init', 'slapos_subscription_request/SubscriptionRequest_init',
'slapos_subscription_request/SubscriptionRequestModule_getTicketFeedUrl', 'slapos_subscription_request/OpenSaleOrderCell_createDiscountSalePackingList',
'slapos_subscription_request/SubscriptionChangeRequest_init',
'slapos_upgrader/Base_activateObjectMigrationToRemoteVirtualMaster', 'slapos_upgrader/Base_activateObjectMigrationToRemoteVirtualMaster',
'slapos_upgrader/Base_activateObjectMigrationToVirtualMaster', 'slapos_upgrader/Base_activateObjectMigrationToVirtualMaster',
'slapos_upgrader/Base_deleteProcessedDocumentDuringPurge', 'slapos_upgrader/Base_deleteProcessedDocumentDuringPurge',
...@@ -381,6 +311,8 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template): ...@@ -381,6 +311,8 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep5', 'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep5',
'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep6', 'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep6',
'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep7', 'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep7',
'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep8',
'slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep9',
'slapos_upgrader/ComputeNode_checkAllocationSupplyToVirtualMaster', 'slapos_upgrader/ComputeNode_checkAllocationSupplyToVirtualMaster',
'slapos_upgrader/ComputeNode_checkSiteMigrationToVirtualMaster', 'slapos_upgrader/ComputeNode_checkSiteMigrationToVirtualMaster',
'slapos_upgrader/ComputeNode_fixupSiteMigrationToVirtualMaster', 'slapos_upgrader/ComputeNode_fixupSiteMigrationToVirtualMaster',
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @ 19ad395f
...@@ -26,7 +26,6 @@ slapos_folder_list = """slapos_erp5 ...@@ -26,7 +26,6 @@ slapos_folder_list = """slapos_erp5
slapos_upgrader slapos_upgrader
slapos_abyss slapos_abyss
slapos_base slapos_base
slapos_jio_api
slapos_contract slapos_contract
slapos_subscription_request slapos_subscription_request
slapos_crm_monitoring slapos_crm_monitoring
...@@ -58,8 +57,6 @@ erp5_accounting ...@@ -58,8 +57,6 @@ erp5_accounting
erp5_accounting_eu erp5_accounting_eu
erp5_accounting_fr erp5_accounting_fr
erp5_administration erp5_administration
erp5_api_jio_sql_revision
erp5_api_style
erp5_authentication_policy erp5_authentication_policy
erp5_auto_logout erp5_auto_logout
erp5_base erp5_base
...@@ -92,9 +89,6 @@ erp5_graph_editor""" ...@@ -92,9 +89,6 @@ erp5_graph_editor"""
common_folder_list = """erp5_jquery_sheet_editor common_folder_list = """erp5_jquery_sheet_editor
erp5_json_editor erp5_json_editor
erp5_json_form
erp5_json_form_react_jsonschema_form
erp5_json_form_slapos
erp5_json_type erp5_json_type
erp5_monaco_editor erp5_monaco_editor
erp5_notebook erp5_notebook
...@@ -161,9 +155,6 @@ custom ...@@ -161,9 +155,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_web_redirect_assist erp5_web_redirect_assist
erp5_knowledge_pad erp5_knowledge_pad
...@@ -179,12 +170,9 @@ erp5_invoicing ...@@ -179,12 +170,9 @@ erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
erp5_xhtml_style erp5_xhtml_style
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -194,9 +182,6 @@ custom ...@@ -194,9 +182,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_knowledge_pad erp5_knowledge_pad
erp5_simulation erp5_simulation
...@@ -223,12 +208,8 @@ erp5_integration ...@@ -223,12 +208,8 @@ erp5_integration
erp5_invoicing erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -241,9 +222,6 @@ erp5_interaction_drop ...@@ -241,9 +222,6 @@ erp5_interaction_drop
slapos_deploy_theme slapos_deploy_theme
erp5_web_hal_json erp5_web_hal_json
erp5_web_renderjs_ui erp5_web_renderjs_ui
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_knowledge_pad erp5_knowledge_pad
erp5_simulation erp5_simulation
...@@ -257,12 +235,9 @@ erp5_integration ...@@ -257,12 +235,9 @@ erp5_integration
erp5_invoicing erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -272,9 +247,6 @@ custom ...@@ -272,9 +247,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_xhtml_disabled erp5_xhtml_disabled
erp5_knowledge_pad erp5_knowledge_pad
...@@ -292,25 +264,18 @@ erp5_jquery ...@@ -292,25 +264,18 @@ erp5_jquery
%(common_folder_list)s %(common_folder_list)s
erp5_xhtml_style erp5_xhtml_style
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
multiflex_selection_string_list = \ multiflex_selection_string_list = \
""" """
custom custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_commerce_multiflex_layout erp5_commerce_multiflex_layout
erp5_knowledge_pad erp5_knowledge_pad
...@@ -325,12 +290,9 @@ erp5_integration ...@@ -325,12 +290,9 @@ erp5_integration
erp5_invoicing erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -340,9 +302,6 @@ custom ...@@ -340,9 +302,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_web_download_theme erp5_web_download_theme
erp5_knowledge_pad erp5_knowledge_pad
...@@ -358,12 +317,9 @@ erp5_invoicing ...@@ -358,12 +317,9 @@ erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
erp5_xhtml_style erp5_xhtml_style
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -373,9 +329,6 @@ custom ...@@ -373,9 +329,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_knowledge_pad erp5_knowledge_pad
erp5_simulation erp5_simulation
...@@ -390,12 +343,9 @@ erp5_integration ...@@ -390,12 +343,9 @@ erp5_integration
erp5_invoicing erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -405,9 +355,6 @@ custom ...@@ -405,9 +355,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_knowledge_pad erp5_knowledge_pad
erp5_simulation erp5_simulation
...@@ -422,12 +369,9 @@ erp5_integration ...@@ -422,12 +369,9 @@ erp5_integration
erp5_invoicing erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -437,9 +381,6 @@ custom ...@@ -437,9 +381,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
slapos_rss_style slapos_rss_style
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_rss_style erp5_rss_style
...@@ -455,12 +396,9 @@ erp5_integration ...@@ -455,12 +396,9 @@ erp5_integration
erp5_invoicing erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -470,9 +408,6 @@ custom ...@@ -470,9 +408,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_web_shadir erp5_web_shadir
erp5_web_download_theme erp5_web_download_theme
...@@ -489,12 +424,9 @@ erp5_invoicing ...@@ -489,12 +424,9 @@ erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
erp5_xhtml_style erp5_xhtml_style
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -504,9 +436,6 @@ custom ...@@ -504,9 +436,6 @@ custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_web_shacache erp5_web_shacache
erp5_web_download_theme erp5_web_download_theme
...@@ -523,12 +452,9 @@ erp5_invoicing ...@@ -523,12 +452,9 @@ erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
erp5_xhtml_style erp5_xhtml_style
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -537,12 +463,9 @@ slapos_panel_compatibility ...@@ -537,12 +463,9 @@ slapos_panel_compatibility
custom custom
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
slapos_web_renderjs_ui
erp5_web_hal_json erp5_web_hal_json
erp5_web_renderjs_ui erp5_web_renderjs_ui
slapos_web_renderjs_ui
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_knowledge_pad erp5_knowledge_pad
erp5_simulation erp5_simulation
...@@ -556,12 +479,9 @@ erp5_integration ...@@ -556,12 +479,9 @@ erp5_integration
erp5_invoicing erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -574,9 +494,6 @@ erp5_interaction_drop ...@@ -574,9 +494,6 @@ erp5_interaction_drop
erp5_hal_json_restricted_style erp5_hal_json_restricted_style
erp5_hal_json_style erp5_hal_json_style
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache
slapos_erp5
slapos_upgrader
%(slapos_folder_list)s %(slapos_folder_list)s
erp5_knowledge_pad erp5_knowledge_pad
erp5_simulation erp5_simulation
...@@ -591,12 +508,9 @@ erp5_invoicing ...@@ -591,12 +508,9 @@ erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
erp5_xhtml_style erp5_xhtml_style
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list,
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list 'slapos_folder_list': slapos_folder_list
} }
...@@ -605,26 +519,7 @@ slapos_panel_compatibility ...@@ -605,26 +519,7 @@ slapos_panel_compatibility
erp5_font erp5_font
erp5_interaction_drop erp5_interaction_drop
erp5_web_hal_json erp5_web_hal_json
slapos_jio_api_cache %(slapos_folder_list)s
slapos_erp5
slapos_upgrader
slapos_abyss
slapos_base
slapos_jio_api
slapos_contract
slapos_subscription_request
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cloud
slapos_consumption
slapos_core
slapos_crm
slapos_payzen
slapos_pdm
slapos_simulation
slapos_slap_tool
slapos_wechat
erp5_slideshow_style erp5_slideshow_style
slapos_configurator slapos_configurator
erp5_knowledge_pad erp5_knowledge_pad
...@@ -640,16 +535,12 @@ erp5_invoicing ...@@ -640,16 +535,12 @@ erp5_invoicing
%(common_folder_list)s %(common_folder_list)s
erp5_xhtml_style erp5_xhtml_style
external_method external_method
slapos_disaster_recovery """ % {'common_folder_list': common_folder_list,
slapos_panel 'common2_folder_list': common2_folder_list,
slapos_panel_compatibility 'common3_folder_list': common3_folder_list,
""" % {'common_folder_list' : common_folder_list, 'slapos_folder_list': "\n".join(slapos_folder_list.splitlines()[:-1])
'common2_folder_list' : common2_folder_list,
'common3_folder_list' : common3_folder_list,
'slapos_folder_list': slapos_folder_list
} }
def getTitle(self): def getTitle(self):
return "Slapos Skin Selection" return "Slapos Skin Selection"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7