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
0
Merge Requests
0
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
Xavier Thompson
slapos.core
Commits
0a548c15
Commit
0a548c15
authored
Jun 23, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Minor improvements (and fixes)
See merge request
!543
parents
c7bd0719
e042a47c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Person_sendSlapOSPendingTicketNotification.py
..._monitoring/Person_sendSlapOSPendingTicketNotification.py
+0
-1
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequest_recheckMonitoring.py
...slapos_crm_monitoring/SupportRequest_recheckMonitoring.py
+2
-1
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getOpenComputeNodeList.py
...kins/slapos_hal_json_style/Base_getOpenComputeNodeList.py
+1
-0
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/InstanceTree_edit.py
...m/portal_skins/slapos_hal_json_style/InstanceTree_edit.py
+3
-2
No files found.
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Person_sendSlapOSPendingTicketNotification.py
View file @
0a548c15
...
@@ -17,7 +17,6 @@ event_kw = {
...
@@ -17,7 +17,6 @@ event_kw = {
# Create event
# Create event
event
=
portal
.
event_module
.
newContent
(
**
event_kw
)
event
=
portal
.
event_module
.
newContent
(
**
event_kw
)
event
.
plan
()
event
.
start
(
send_mail
=
True
,
comment
=
"Sent via Person_sendSlapOSPendingTicketNotification"
)
event
.
start
(
send_mail
=
True
,
comment
=
"Sent via Person_sendSlapOSPendingTicketNotification"
)
if
batch_mode
:
if
batch_mode
:
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequest_recheckMonitoring.py
View file @
0a548c15
...
@@ -6,7 +6,6 @@ if context.getSimulationState() == "invalidated":
...
@@ -6,7 +6,6 @@ if context.getSimulationState() == "invalidated":
if
context
.
getPortalType
()
!=
"Support Request"
:
if
context
.
getPortalType
()
!=
"Support Request"
:
return
"Not a Support Request"
return
"Not a Support Request"
now
=
DateTime
()
now
=
DateTime
()
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
document
=
context
.
getAggregateValue
()
document
=
context
.
getAggregateValue
()
...
@@ -49,6 +48,8 @@ if aggregate_portal_type == "Compute Node":
...
@@ -49,6 +48,8 @@ if aggregate_portal_type == "Compute Node":
break
break
if
is_instance_stalled
and
len
(
instance_list
):
if
is_instance_stalled
and
len
(
instance_list
):
if
last_contact
is
None
:
return
"Process instance stalled"
return
"Process instance stalled, last contact was %s"
%
last_contact
return
"Process instance stalled, last contact was %s"
%
last_contact
return
"All OK, latest contact: %s "
%
last_contact
return
"All OK, latest contact: %s "
%
last_contact
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getOpenComputeNodeList.py
View file @
0a548c15
...
@@ -9,4 +9,5 @@ return portal.portal_catalog(
...
@@ -9,4 +9,5 @@ return portal.portal_catalog(
category_public
.
getUid
(),
category_public
.
getUid
(),
category_personal
.
getUid
()],
category_personal
.
getUid
()],
validation_state
=
"validated"
,
validation_state
=
"validated"
,
sort_on
=
((
"title"
,
"ASC"
),)
)
)
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/InstanceTree_edit.py
View file @
0a548c15
...
@@ -21,8 +21,9 @@ def isSoftwareTypeChanged(software_type):
...
@@ -21,8 +21,9 @@ def isSoftwareTypeChanged(software_type):
current_software_type
=
context
.
getSourceReference
()
current_software_type
=
context
.
getSourceReference
()
if
software_type
in
base_type
and
current_software_type
in
base_type
:
if
software_type
in
base_type
and
current_software_type
in
base_type
:
return
False
return
False
else
:
if
software_type
in
[
None
,
""
]:
return
current_software_type
!=
software_type
return
False
return
current_software_type
!=
software_type
if
'software_type'
in
request
and
isSoftwareTypeChanged
(
request
[
'software_type'
]):
if
'software_type'
in
request
and
isSoftwareTypeChanged
(
request
[
'software_type'
]):
raise
ValueError
(
"Change Software Type is forbidden."
)
raise
ValueError
(
"Change Software Type is forbidden."
)
...
...
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