diff --git a/spectrum_manager/src/html/header.shtml b/spectrum_manager/src/html/header.shtml index b06dc1976106613f3dbad30d47e1993fda1172d8..27983b48be875da3275b081cd2d075a3c83af28f 100644 --- a/spectrum_manager/src/html/header.shtml +++ b/spectrum_manager/src/html/header.shtml @@ -11,6 +11,7 @@ + Spectrum 2 diff --git a/spectrum_manager/src/html/js/app.js b/spectrum_manager/src/html/js/app.js index dc601b7993b1b830588afae7fee01d31c55e2b9b..ecc7f68a20a645bb3a07b6eda18aee4d1cca76f4 100644 --- a/spectrum_manager/src/html/js/app.js +++ b/spectrum_manager/src/html/js/app.js @@ -214,7 +214,7 @@ function fill_users_register_form() { "password": $("#password").val() }; - $.post("/api/v1/users/add", postdata, function(data) { + $.post(BaseLocation + "api/v1/users/add", postdata, function(data) { if (data.error) { $('#error').text(data.message); } diff --git a/spectrum_manager/src/server.cpp b/spectrum_manager/src/server.cpp index 3aac24fc4c8bc9b713acf81f2dd07dd7a420375d..4aabf938eb0f6571cfb25a9e5d6d8e3db552ab72 100644 --- a/spectrum_manager/src/server.cpp +++ b/spectrum_manager/src/server.cpp @@ -105,6 +105,14 @@ Server::Server(ManagerConfig *config, const std::string &config_file) { footer.close(); } + std::ofstream output; + output.open(std::string(CONFIG_STRING(config, "service.data_dir") + "/js/config.js").c_str(), std::ios::out); + if (output.fail()) { + LOG4CXX_ERROR(logger, "Cannot open " << std::string(CONFIG_STRING(config, "service.data_dir") + "/js/config.js") << " for writing: " << strerror(errno)); + } + output << "var BaseLocation = \"" << CONFIG_STRING(m_config, "service.base_location") << "\";\n"; + output.close(); + m_storageCfg = new Config(); m_storageCfg->load(config_file); @@ -235,6 +243,7 @@ bool Server::is_authorized(const struct mg_connection *conn, struct http_message !mg_vcmp(&hm->uri, "/js/jquery.js") || !mg_vcmp(&hm->uri, "/js/jquery-ui.js") || !mg_vcmp(&hm->uri, "/js/jquery.cookie.js") || + !mg_vcmp(&hm->uri, "/js/config.js") || !mg_vcmp(&hm->uri, "/js/app.js") || !mg_vcmp(&hm->uri, "/users/register.shtml") || !mg_vcmp(&hm->uri, "/api/v1/users/add") || diff --git a/tests/tests_output/localhost/vcard/client.dat b/tests/tests_output/localhost/vcard/client.dat index a5b3795759d24f2c35396986fe555385a0fd6de5..96c1073dafef06c5c0ca998eb118088865eac5da 100644 --- a/tests/tests_output/localhost/vcard/client.dat +++ b/tests/tests_output/localhost/vcard/client.dat @@ -20,8 +20,8 @@ return { }; }; ["attr"] = { - ["version"] = "2.0"; ["prodid"] = "-//HandGen//NONSGML vGen v1.0//EN"; + ["version"] = "2.0"; ["xmlns"] = "vcard-temp"; }; ["name"] = "vCard";