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
1b5157a2
Commit
1b5157a2
authored
May 12, 2023
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_subscription_request: drop SubscriptionCondition_renderParameter
parent
38722e37
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
67 deletions
+0
-67
master/bt5/slapos_subscription_request/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSSubscriptionRequest.py
...al_components/extension.erp5.SlapOSSubscriptionRequest.py
+0
-7
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionCondition_renderParameter.xml
...ription_request/SubscriptionCondition_renderParameter.xml
+0
-28
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py
...ortal_components/test.erp5.testSlapOSSubscriptionSkins.py
+0
-32
No files found.
master/bt5/slapos_subscription_request/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSSubscriptionRequest.py
View file @
1b5157a2
...
...
@@ -12,13 +12,6 @@ def SubscriptionRequest_getTransactionalUser(self, REQUEST=None):
raise
Unauthorized
return
getTransactionalVariable
().
get
(
"transactional_user"
,
None
)
def
SubscriptionCondition_renderParameter
(
self
,
amount
=
0
,
**
kw
):
method_id
=
self
.
getParameterTemplateRendererMethodId
()
if
method_id
is
not
None
:
return
getattr
(
self
,
method_id
)(
amount
=
amount
,
**
kw
)
return
self
.
getTextContent
()
def
SubscriptionRequest_searchExistingUserByEmail
(
self
,
email
,
REQUEST
=
None
):
if
REQUEST
is
not
None
:
raise
Unauthorized
...
...
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionCondition_renderParameter.xml
deleted
100644 → 0
View file @
38722e37
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ExternalMethod"
module=
"Products.ExternalMethod.ExternalMethod"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_function
</string>
</key>
<value>
<string>
SubscriptionCondition_renderParameter
</string>
</value>
</item>
<item>
<key>
<string>
_module
</string>
</key>
<value>
<string>
SlapOSSubscriptionRequest
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
SubscriptionCondition_renderParameter
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py
View file @
1b5157a2
...
...
@@ -104,38 +104,6 @@ class TestSubscriptionSkinsMixin(SlapOSTestCaseMixinWithAbort):
return
subscription_request
class
TestSubscriptionCondition_renderParameter
(
TestSubscriptionSkinsMixin
):
@
simulate
(
'SubscriptionCondition_renderParameterSampleScript'
,
'*args, **kwargs'
,
'return args, kwargs'
)
def
test_call_script
(
self
):
subscription_condition
=
self
.
newSubscriptionCondition
()
subscription_condition
.
setParameterTemplateRendererMethodId
(
"SubscriptionCondition_renderParameterSampleScript"
)
self
.
assertEqual
(((),
{
'amount'
:
1
}),
subscription_condition
.
SubscriptionCondition_renderParameter
(
amount
=
1
))
def
test_script_is_not_set
(
self
):
parameter_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
<instance>
<parameter id="_">{
"kvm-partition-dict": {
"KVM0": {
"cpu-count": 40,
"cpu-max-count": 41,
"ram-size": 245760,
"ram-max-size": 245761,
"disk-device-path": "/dev/sdb",
"project-guid": "PROJ-XXXX",
"disable-ansible-promise": true
}
}
}</parameter>
</instance>"""
subscription_condition
=
self
.
newSubscriptionCondition
()
self
.
assertEqual
(
None
,
subscription_condition
.
SubscriptionCondition_renderParameter
(
amount
=
1
))
subscription_condition
.
setTextContent
(
parameter_xml
)
self
.
assertEqual
(
parameter_xml
,
subscription_condition
.
SubscriptionCondition_renderParameter
(
amount
=
1
))
class
TestSubscriptionRequest_init
(
TestSubscriptionSkinsMixin
):
def
test_SubscriptionRequest_init
(
self
):
subscription_request
=
self
.
portal
.
subscription_request_module
.
newContent
()
...
...
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