libtransport.git Changeset - 3a19c755fbcd

Changeset - 3a19c755fbcd

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 10 years ago 2016-02-25 08:52:28
jkaluza@redhat.com

Web interface: Fix base_location setting for register.shtml page

4 files changed with 12 insertions and 2 deletions:

spectrum_manager/src/html/header.shtml

spectrum_manager/src/html/js/app.js

spectrum_manager/src/server.cpp

tests/tests_output/localhost/vcard/client.dat

0 comments (0 inline, 0 general)

spectrum_manager/src/html/header.shtml

➞

Show inline comments

@@ @@ -8,12 +8,13 @@ @@
     <link href="/style.css" rel="stylesheet" type="text/css" media="all">
     <link href="/form.css" rel="stylesheet" type="text/css" media="all">
     <link href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet" type="text/css" media="all">
     <script src="/js/jquery.js"></script>
     <script src="/js/jquery-ui.js"></script>
     <script src="/js/jquery.cookie.js"></script>
     <script src="/js/config.js"></script>
     <script src="/js/app.js"></script>
     <title>Spectrum 2</title>
   </head>
   <body>

spectrum_manager/src/html/js/app.js

➞

Show inline comments

@@ @@ -211,13 +211,13 @@ function fill_users_register_form() { @@
 		var postdata ={
 			"username": $("#username").val(),
 			"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);
+			}
 			else {
 				var query = getQueryParams(document.location.search);
 				if (query.back_to_list == "1") {

spectrum_manager/src/server.cpp

➞

Show inline comments

 		m_footer.resize(footer.tellg());
 		footer.seekg(0, std::ios::beg);
 		footer.read(&m_footer[0], m_footer.size());
 		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);
 	Logging::initManagerLogging(m_storageCfg);
 	std::string error;
 	m_storage = StorageBackend::createBackend(m_storageCfg, error);
 		!mg_vcmp(&hm->uri, "/form.css") ||
 		!mg_vcmp(&hm->uri, "/style.css") ||
 		!mg_vcmp(&hm->uri, "/logo.png") ||
 		!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") ||
 		!mg_vcmp(&hm->uri, "/authorize")) {
 		return true;
+	}

tests/tests_output/localhost/vcard/client.dat

➞

Show inline comments

@@ @@ -17,12 +17,12 @@ return { @@
 		["name"] = "PHOTO";
 		["attr"] = {
 			["xmlns"] = "vcard-temp";
 		};
 	};
 	["attr"] = {
 		["version"] = "2.0";
 		["prodid"] = "-//HandGen//NONSGML vGen v1.0//EN";
 		["version"] = "2.0";
 		["xmlns"] = "vcard-temp";
 	};
 	["name"] = "vCard";
 };

0 comments (0 inline, 0 general)