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
Léo-Paul Géneau
slapos.core
Commits
4a295cba
Commit
4a295cba
authored
Jan 09, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_crm: Display age of the message at the report
parent
f6df7e60
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequestModule_viewInstanceMessageList/listbox.xml
.../SupportRequestModule_viewInstanceMessageList/listbox.xml
+8
-0
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequest_getInstanceMessageList.py
...s_crm_monitoring/SupportRequest_getInstanceMessageList.py
+8
-2
No files found.
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequestModule_viewInstanceMessageList/listbox.xml
View file @
4a295cba
...
@@ -417,6 +417,14 @@
...
@@ -417,6 +417,14 @@
<string>
message
</string>
<string>
message
</string>
<string>
Error Message
</string>
<string>
Error Message
</string>
</tuple>
</tuple>
<tuple>
<string>
created_at
</string>
<string>
Date
</string>
</tuple>
<tuple>
<string>
age
</string>
<string>
Age
</string>
</tuple>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequest_getInstanceMessageList.py
View file @
4a295cba
...
@@ -33,6 +33,9 @@ if aggregate_portal_type == "Hosting Subscription":
...
@@ -33,6 +33,9 @@ if aggregate_portal_type == "Hosting Subscription":
if
instance
.
getPortalType
()
==
"Software Instance"
and
\
if
instance
.
getPortalType
()
==
"Software Instance"
and
\
instance
.
getSlapState
()
==
"start_requested"
and
\
instance
.
getSlapState
()
==
"start_requested"
and
\
instance
.
SoftwareInstance_hasReportedError
():
instance
.
SoftwareInstance_hasReportedError
():
m
,
create_at
,
since
=
instance
.
SoftwareInstance_hasReportedError
(
include_message
=
True
,
include_created_at
=
True
,
include_since
=
True
)
message_list
.
append
(
newTempDocument
(
message_list
.
append
(
newTempDocument
(
document
,
instance
.
getRelativeUrl
(),
**
{
document
,
instance
.
getRelativeUrl
(),
**
{
"uid"
:
instance
.
getUid
(),
"uid"
:
instance
.
getUid
(),
...
@@ -41,12 +44,15 @@ if aggregate_portal_type == "Hosting Subscription":
...
@@ -41,12 +44,15 @@ if aggregate_portal_type == "Hosting Subscription":
"software_release"
:
instance
.
getUrlString
(),
"software_release"
:
instance
.
getUrlString
(),
"computer_reference"
:
computer
.
getReference
(),
"computer_reference"
:
computer
.
getReference
(),
"allocation_scope"
:
computer
.
getAllocationScope
(),
"allocation_scope"
:
computer
.
getAllocationScope
(),
"message"
:
instance
.
SoftwareInstance_hasReportedError
(
include_message
=
True
)}))
"message"
:
m
,
"created_at"
:
create_at
,
"since"
:
since
,
"age"
:
"%s m ago"
%
(
int
((
DateTime
()
-
DateTime
(
since
))
*
24
*
60
))}))
else
:
else
:
message_list
.
append
(
newTempDocument
(
message_list
.
append
(
newTempDocument
(
document
,
instance
.
getRelativeUrl
(),
**
{
document
,
instance
.
getRelativeUrl
(),
**
{
"uid"
:
instance
.
getUid
(),
"uid"
:
instance
.
getUid
(),
"title"
:
instance
.
t
itle
(),
"title"
:
instance
.
getT
itle
(),
"specialise_title"
:
hosting_subscription
.
getTitle
(),
"specialise_title"
:
hosting_subscription
.
getTitle
(),
"software_release"
:
instance
.
getUrlString
(),
"software_release"
:
instance
.
getUrlString
(),
"computer_reference"
:
""
,
"computer_reference"
:
""
,
...
...
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