Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinis Detlavs <reinis.detlavs@zabbix.com>2022-04-14 11:38:58 +0300
committerReinis Detlavs <reinis.detlavs@zabbix.com>2022-04-14 11:38:58 +0300
commitcb5b3a62398c442a92ce1a14aacc441251335340 (patch)
tree390bed56ee0efba1fbd2075d452a5b5665f846bf
parentd5b1f273b012fbd1341f2ab154d5e0cc9e7277b9 (diff)
parent58513291843eb7abc22748e2daff7819259925a0 (diff)
..F....... [ZBXNEXT-7525] fixed inconsistent trigger links in Configuration -> Items
* commit '58513291843eb7abc22748e2daff7819259925a0': ..F....... [ZBXNEXT-7525] fixed inconsistent trigger links in Configuration -> Items
-rw-r--r--ChangeLog.d/feature/ZBXNEXT-75251
-rw-r--r--ui/include/views/configuration.item.list.php23
2 files changed, 10 insertions, 14 deletions
diff --git a/ChangeLog.d/feature/ZBXNEXT-7525 b/ChangeLog.d/feature/ZBXNEXT-7525
new file mode 100644
index 00000000000..415e385ff14
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-7525
@@ -0,0 +1 @@
+..F....... [ZBXNEXT-7525] fixed inconsistent trigger links in Configuration -> Items (rdetlavs)
diff --git a/ui/include/views/configuration.item.list.php b/ui/include/views/configuration.item.list.php
index 7dcb5e8fddb..7d26135f46e 100644
--- a/ui/include/views/configuration.item.list.php
+++ b/ui/include/views/configuration.item.list.php
@@ -184,20 +184,15 @@ foreach ($data['items'] as $item) {
$trigger['hosts'] = zbx_toHash($trigger['hosts'], 'hostid');
- if ($trigger['flags'] == ZBX_FLAG_DISCOVERY_CREATED) {
- $trigger_description[] = new CSpan(CHtml::encode($trigger['description']));
- }
- else {
- $trigger_description[] = new CLink(
- CHtml::encode($trigger['description']),
- (new CUrl('triggers.php'))
- ->setArgument('form', 'update')
- ->setArgument('hostid', key($trigger['hosts']))
- ->setArgument('triggerid', $trigger['triggerid'])
- ->setArgument('context', $data['context'])
- ->setArgument('backurl', $backurl)
- );
- }
+ $trigger_description[] = new CLink(
+ CHtml::encode($trigger['description']),
+ (new CUrl('triggers.php'))
+ ->setArgument('form', 'update')
+ ->setArgument('hostid', key($trigger['hosts']))
+ ->setArgument('triggerid', $trigger['triggerid'])
+ ->setArgument('context', $data['context'])
+ ->setArgument('backurl', $backurl)
+ );
if ($trigger['state'] == TRIGGER_STATE_UNKNOWN) {
$trigger['error'] = '';