From 144ccb07e8e28d009d4139f065dc5ad1541fad78 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 28 Jan 2016 09:23:41 +0100 Subject: [PATCH] Web interface: Fix missing ',' in app.js --- spectrum_manager/src/APIServer.cpp | 4 ++++ spectrum_manager/src/html/js/app.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spectrum_manager/src/APIServer.cpp b/spectrum_manager/src/APIServer.cpp index e06c9d41..1a83aaa2 100644 --- a/spectrum_manager/src/APIServer.cpp +++ b/spectrum_manager/src/APIServer.cpp @@ -152,6 +152,10 @@ void APIServer::serve_instances_list_rooms(Server *server, Server::session *sess Document json; json.SetObject(); json.AddMember("error", 0, json.GetAllocator()); + json.AddMember("name_label", "Nickname in 3rd-party room", json.GetAllocator()); + json.AddMember("legacy_room_label", "3rd-party room name", json.GetAllocator()); + json.AddMember("legacy_server_label", "3rd-party server", json.GetAllocator()); + json.AddMember("frontend_room_label", "Slack channel", json.GetAllocator()); std::vector > tmp; Value rooms(kArrayType); diff --git a/spectrum_manager/src/html/js/app.js b/spectrum_manager/src/html/js/app.js index f0312a7b..e6cda348 100644 --- a/spectrum_manager/src/html/js/app.js +++ b/spectrum_manager/src/html/js/app.js @@ -137,7 +137,7 @@ function fill_instances_join_room_form() { var postdata ={ "name": $("#name").val(), "legacy_room": $("#legacy_room").val(), - "legacy_server": $("#legacy_server").val() + "legacy_server": $("#legacy_server").val(), "frontend_room": $("#frontend_room").val() };