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
17
Merge Requests
17
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
be0d00d6
Commit
be0d00d6
authored
Aug 23, 2021
by
Rafael Monnerat
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: Update in case of conflict
parent
4692cf02
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
master/bt5/slapos_cloud/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSCloud.py
...plateItem/portal_components/extension.erp5.SlapOSCloud.py
+7
-4
master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
.../slapos_cloud/bt/template_portal_type_property_sheet_list
+1
-0
No files found.
master/bt5/slapos_cloud/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSCloud.py
View file @
be0d00d6
...
...
@@ -103,9 +103,15 @@ def HostingSubscription_checkInstanceTreeMigrationConsistency(self, fixit=False)
portal
=
self
.
getPortalObject
()
# Do not use accessor, as backward compatibility will not be kept
if
self
.
getParentValue
().
getId
()
!=
"hosting_subscription_module"
:
# Skip if the document isn't on the hosting_subscription_module
return
error_list
mod
=
__import__
(
'erp5.portal_type'
,
globals
(),
locals
(),
[
'Instance Tree'
])
klass
=
getattr
(
mod
,
'Instance Tree'
)
if
((
getattr
(
self
,
'workflow_history'
,
None
)
is
not
None
)
and
(
'hosting_subscription_workflow'
in
self
.
workflow_history
))
or
\
(
self
.
__class__
==
klass
)
or
\
(
self
.
getProperty
(
'sla_xml'
,
None
)
is
not
None
)
or
\
([
x
for
x
in
self
.
getCategoryList
()
if
(
x
.
startswith
(
'predecessor/'
)
or
x
.
startswith
(
'successor/'
))]):
...
...
@@ -117,9 +123,6 @@ def HostingSubscription_checkInstanceTreeMigrationConsistency(self, fixit=False)
self
.
getParentValue
().
_delObject
(
hosting_subscription_id
)
mod
=
__import__
(
'erp5.portal_type'
,
globals
(),
locals
(),
[
'Instance Tree'
])
klass
=
getattr
(
mod
,
'Instance Tree'
)
self
.
__class__
=
klass
# self.upgradeObjectClass(returnTrue, 'erp5.portal_type.Hosting Subscription', 'erp5.portal_type.Instance Tree', returnTrue)
self
.
portal_type
=
'Instance Tree'
...
...
master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
View file @
be0d00d6
...
...
@@ -10,6 +10,7 @@ Computer | SlaposComputerConstraint
Computer | Url
Email | SlaposEmailConstraint
Hosting Subscription | HostingSubscriptionUpgradeConstraint
Instance Tree | HostingSubscriptionUpgradeConstraint
Instance Tree | InstanceTree
Instance Tree | SlaposInstanceTreeConstraint
Instance Tree | SoftwareInstance
...
...
Romain Courteaud
@romain
mentioned in commit
romain/slapos.core@f351f1cb
·
Aug 26, 2021
mentioned in commit
romain/slapos.core@f351f1cb
mentioned in commit romain/slapos.core@f351f1cbf08c0833881c07b2a758a0020f7848ae
Toggle commit list
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