Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
noc
noc
Commits
5f6fe851
Commit
5f6fe851
authored
Jun 30, 2022
by
MaksimSmile13
Browse files
Merge branch 'cherry-pick-
84fd2705
' into 'release-22.1'
release-22.1:Backport!6423 See merge request
!6424
parents
ddc1fb8f
985173f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
core/datasources/reportdsalarms.py
View file @
5f6fe851
# ----------------------------------------------------------------------
# ReportDsAlarms datasource
# ----------------------------------------------------------------------
# Copyright (C) 2007-202
1
The NOC Project
# Copyright (C) 2007-202
2
The NOC Project
# See LICENSE for details
# ----------------------------------------------------------------------
...
...
@@ -157,11 +157,6 @@ class ReportDsAlarms(BaseDataSource):
# label="LOCATION",
description
=
"Месторасположение"
,
),
FieldInfo
(
name
=
"container_address"
,
# label="CONTAINER_ADDRESS",
description
=
"Месторасположение"
,
),
]
+
[
FieldInfo
(
name
=
f
"subsprof_
{
sp
.
name
}
"
)
# label=sp.name.upper())
...
...
@@ -435,7 +430,6 @@ class ReportDsAlarms(BaseDataSource):
"maintenance"
:
"Yes"
if
"clear_timestamp"
not
in
aa
and
aa
[
"managed_object"
]
in
maintenance
else
"No"
,
"container_address"
:
""
,
}
for
sp_name
,
sp_id
in
subscribers_profile
:
dd
=
cls
.
items_to_dict
(
aa
[
"total_subscribers"
])
...
...
services/web/apps/fm/reportalarmdetail/views.py
View file @
5f6fe851
# ---------------------------------------------------------------------
# fm.reportalarmdetail application
# ---------------------------------------------------------------------
# Copyright (C) 2007-202
0
The NOC Project
# Copyright (C) 2007-202
2
The NOC Project
# See LICENSE for details
# ---------------------------------------------------------------------
...
...
@@ -85,7 +85,6 @@ class ReportAlarmDetailApplication(ExtApplication):
"tt"
:
_
(
"TT"
),
"escalation_ts"
:
_
(
"ESCALATION_TS"
),
"location"
:
_
(
"LOCATION"
),
"container_address"
:
_
(
"CONTAINER_ADDRESS"
),
}
@
view
(
...
...
ui/web/fm/reportalarmdetail/Application.js
View file @
5f6fe851
// fm.reportalarmdetail application
//---------------------------------------------------------------------
// Copyright (C) 2007-20
16
The NOC Project
// Copyright (C) 2007-20
22
The NOC Project
// See LICENSE for details
//---------------------------------------------------------------------
console
.
debug
(
"
Defining NOC.fm.reportalarmdetail.Application
"
);
...
...
@@ -187,7 +187,6 @@ Ext.define("NOC.fm.reportalarmdetail.Application", {
[
"
tt
"
,
__
(
"
TT
"
),
true
],
[
"
escalation_ts
"
,
__
(
"
Escalation Time
"
),
true
],
[
"
location
"
,
__
(
"
Location
"
),
true
],
[
"
container_address
"
,
__
(
"
Container Address
"
),
false
],
[
"
container_0
"
,
__
(
"
Container (Level 1)
"
),
false
],
[
"
container_1
"
,
__
(
"
Container (Level 2)
"
),
false
],
[
"
container_2
"
,
__
(
"
Container (Level 3)
"
),
false
],
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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