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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
bd6366c0
Commit
bd6366c0
authored
Nov 21, 2023
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_panel: add activate_kw parameter
parent
57063d0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Person_addVirtualMaster.py
...Item/portal_skins/slapos_panel/Person_addVirtualMaster.py
+11
-6
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Person_addVirtualMaster.xml
...tem/portal_skins/slapos_panel/Person_addVirtualMaster.xml
+1
-1
No files found.
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Person_addVirtualMaster.py
View file @
bd6366c0
...
...
@@ -7,7 +7,8 @@ customer = context
project
=
portal
.
project_module
.
newContent
(
portal_type
=
'Project'
,
destination_value
=
customer
,
title
=
title
title
=
title
,
activate_kw
=
activate_kw
)
project
.
validate
()
...
...
@@ -26,7 +27,7 @@ except AssertionError, e:
},
abort_transaction
=
True
,
)
subscription_request
.
reindexObject
(
activate_kw
=
activate_kw
)
# XXX How to specify the trade condition containing the currency and trade model lines?
specialise_value
=
subscription_request
.
getSpecialiseValue
(
portal_type
=
"Sale Trade Condition"
)
...
...
@@ -43,12 +44,14 @@ if specialise_value is None:
customer
.
newContent
(
portal_type
=
'Assignment'
,
destination_project_value
=
project
,
function
=
'production/manager'
function
=
'production/manager'
,
activate_kw
=
activate_kw
).
open
()
customer
.
newContent
(
portal_type
=
'Assignment'
,
destination_project_value
=
project
,
function
=
'customer'
function
=
'customer'
,
activate_kw
=
activate_kw
).
open
()
# Compute Node trade condition
...
...
@@ -69,7 +72,8 @@ sale_trade_condition = portal.sale_trade_condition_module.newContent(
source_value
=
subscription_request
.
getSourceValue
(),
source_section_value
=
source_section_value
,
#source_payment_value=seller_bank_account,
price_currency_value
=
currency_value
price_currency_value
=
currency_value
,
activate_kw
=
activate_kw
)
sale_trade_condition
.
validate
()
...
...
@@ -91,7 +95,8 @@ sale_trade_condition = portal.sale_trade_condition_module.newContent(
source_value
=
subscription_request
.
getSourceValue
(),
source_section_value
=
source_section_value
,
#source_payment_value=seller_bank_account,
price_currency_value
=
currency_value
price_currency_value
=
currency_value
,
activate_kw
=
activate_kw
)
sale_trade_condition
.
validate
()
...
...
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Person_addVirtualMaster.xml
View file @
bd6366c0
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
title, is_compute_node_payable , is_instance_tree_payable, price_currency, batch=0, **kw
</string>
</value>
<value>
<string>
title, is_compute_node_payable , is_instance_tree_payable, price_currency, batch=0,
activate_kw=None,
**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
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