From 9f20abd76a2ddda2833353db55d2a816473bd9e8 Mon Sep 17 00:00:00 2001
From: Janis Freibergs <janis.freibergs@zabbix.com>
Date: Thu, 10 Jun 2021 15:48:09 +0300
Subject: ..F....... [ZBX-19123] fixed sorting by name or status on action page

* commit '839272a06e4e3112da8c2e3d63600c98df063015':
  ..F....... [ZBX-19123] updated changelog message; placed order_result() after acquiring data
  ..F....... [ZBX-19123] fixed sorting of actions

(cherry picked from commit f251c101856af250ff19c4395aee0a3816c63434)
(cherry picked from commit 6db70714ff80609b070c4635aee4f414f158d1d3)
---
 ChangeLog.d/bugfix/ZBX-19123 | 1 +
 ui/actionconf.php            | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 ChangeLog.d/bugfix/ZBX-19123

diff --git a/ChangeLog.d/bugfix/ZBX-19123 b/ChangeLog.d/bugfix/ZBX-19123
new file mode 100644
index 00000000000..abfd4aaaed4
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-19123
@@ -0,0 +1 @@
+..F....... [ZBX-19123] fixed sorting by name or status on action page (jfreibergs)
diff --git a/ui/actionconf.php b/ui/actionconf.php
index 00bf3d803e0..ba8783a6017 100644
--- a/ui/actionconf.php
+++ b/ui/actionconf.php
@@ -587,6 +587,7 @@ else {
 		'sortfield' => $sortField,
 		'limit' => $limit
 	]);
+	order_result($data['actions'], $sortField, $sortOrder);
 
 	// pager
 	if (hasRequest('page')) {
-- 
cgit v1.2.3