Commit 84fd2705 authored by MaksimSmile13's avatar MaksimSmile13
Browse files

Merge branch 'noc-fix-reportalarmdetail' into 'master'

Fix ReportAlarmDetail - remove container_address

See merge request noc/noc!6423
parents 5a59f266 92578676
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# ReportDsAlarms datasource # ReportDsAlarms datasource
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Copyright (C) 2007-2021 The NOC Project # Copyright (C) 2007-2022 The NOC Project
# See LICENSE for details # See LICENSE for details
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -157,11 +157,6 @@ class ReportDsAlarms(BaseDataSource): ...@@ -157,11 +157,6 @@ class ReportDsAlarms(BaseDataSource):
# label="LOCATION", # label="LOCATION",
description="Месторасположение", description="Месторасположение",
), ),
FieldInfo(
name="container_address",
# label="CONTAINER_ADDRESS",
description="Месторасположение",
),
] ]
+ [ + [
FieldInfo(name=f"subsprof_{sp.name}") # label=sp.name.upper()) FieldInfo(name=f"subsprof_{sp.name}") # label=sp.name.upper())
...@@ -435,7 +430,6 @@ class ReportDsAlarms(BaseDataSource): ...@@ -435,7 +430,6 @@ class ReportDsAlarms(BaseDataSource):
"maintenance": "Yes" "maintenance": "Yes"
if "clear_timestamp" not in aa and aa["managed_object"] in maintenance if "clear_timestamp" not in aa and aa["managed_object"] in maintenance
else "No", else "No",
"container_address": "",
} }
for sp_name, sp_id in subscribers_profile: for sp_name, sp_id in subscribers_profile:
dd = cls.items_to_dict(aa["total_subscribers"]) dd = cls.items_to_dict(aa["total_subscribers"])
......
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# fm.reportalarmdetail application # fm.reportalarmdetail application
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# Copyright (C) 2007-2020 The NOC Project # Copyright (C) 2007-2022 The NOC Project
# See LICENSE for details # See LICENSE for details
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
...@@ -85,7 +85,6 @@ class ReportAlarmDetailApplication(ExtApplication): ...@@ -85,7 +85,6 @@ class ReportAlarmDetailApplication(ExtApplication):
"tt": _("TT"), "tt": _("TT"),
"escalation_ts": _("ESCALATION_TS"), "escalation_ts": _("ESCALATION_TS"),
"location": _("LOCATION"), "location": _("LOCATION"),
"container_address": _("CONTAINER_ADDRESS"),
} }
@view( @view(
......
// fm.reportalarmdetail application // fm.reportalarmdetail application
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// Copyright (C) 2007-2016 The NOC Project // Copyright (C) 2007-2022 The NOC Project
// See LICENSE for details // See LICENSE for details
//--------------------------------------------------------------------- //---------------------------------------------------------------------
console.debug("Defining NOC.fm.reportalarmdetail.Application"); console.debug("Defining NOC.fm.reportalarmdetail.Application");
...@@ -187,7 +187,6 @@ Ext.define("NOC.fm.reportalarmdetail.Application", { ...@@ -187,7 +187,6 @@ Ext.define("NOC.fm.reportalarmdetail.Application", {
["tt", __("TT"), true], ["tt", __("TT"), true],
["escalation_ts", __("Escalation Time"), true], ["escalation_ts", __("Escalation Time"), true],
["location", __("Location"), true], ["location", __("Location"), true],
["container_address", __("Container Address"), false],
["container_0", __("Container (Level 1)"), false], ["container_0", __("Container (Level 1)"), false],
["container_1", __("Container (Level 2)"), false], ["container_1", __("Container (Level 2)"), false],
["container_2", __("Container (Level 3)"), false], ["container_2", __("Container (Level 3)"), false],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment