From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 15 May 2015 13:56:31 +0000 (+0100)
Subject: Fix symbols output in the webui.
X-Git-Tag: 0.9.1~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d31590f0491c5be21a588ab600e18a8f4d35c23;p=rspamd.git

Fix symbols output in the webui.
---

diff --git a/interface b/interface
index f21ffa4ce..766599cad 160000
--- a/interface
+++ b/interface
@@ -1 +1 @@
-Subproject commit f21ffa4ce6e35af6fa6c318971c7a58719b4c524
+Subproject commit 766599cad32bc948ee64adb9f32de22ab64b9e6c
diff --git a/src/controller.c b/src/controller.c
index 11ead024f..815aa125b 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -483,7 +483,7 @@ rspamd_controller_handle_symbols (struct rspamd_http_connection_entry *conn_ent,
 	GHashTableIter it;
 	struct rspamd_symbols_group *gr;
 	struct rspamd_symbol_def *sym, *cur;
-	ucl_object_t *obj, *top, *sym_obj;
+	ucl_object_t *obj, *top, *sym_obj, *group_symbols;
 	gpointer k, v;
 
 	if (!rspamd_controller_check_password (conn_ent, session, msg, FALSE)) {
@@ -502,6 +502,8 @@ rspamd_controller_handle_symbols (struct rspamd_http_connection_entry *conn_ent,
 		/* Iterate through all symbols */
 		sym = gr->symbols;
 
+		group_symbols = ucl_object_typed_new (UCL_ARRAY);
+
 		LL_FOREACH (sym, cur) {
 			sym_obj = ucl_object_typed_new (UCL_OBJECT);
 
@@ -516,9 +518,10 @@ rspamd_controller_handle_symbols (struct rspamd_http_connection_entry *conn_ent,
 					"description", 0, false);
 			}
 
-			ucl_object_insert_key (obj, sym_obj, "rules", 0, false);
+			ucl_array_append (group_symbols, sym_obj);
 		}
 
+		ucl_object_insert_key (obj, group_symbols, "rules", 0, false);
 		ucl_array_append (top, obj);
 	}