X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=4f4cc5cc94cec3a0034dbb92b4d2f77b7ad7bf06;hb=fbe408c72c6c4211e329ddab3b54a42034efc0f4;hp=37694228ae9f19a617ef1d7fb25abd1b7e0cfe99;hpb=0afab23ce298ced8796a4762d1e9bb0bfb0703f9;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3769422..4f4cc5c 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -569,10 +569,8 @@ function renderDetails(data, marker)
details += renderField("Subject", data["location"][0]["md-subject"]);
if (locations.length == 0) {
details += '
No locations for record! |
';
- } else if (locations.length == 1) {
- details += renderField("Location", locations);
} else {
- details += renderField("Locations", locations);
+ details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations);
}
details += '';
@@ -674,7 +672,8 @@ function mkws_html_all() {
mkws_html_switch();
if (mkws_config.use_service_proxy)
- mkws_service_proxy_auth(mkws_config.service_proxy_auth);
+ mkws_service_proxy_auth(mkws_config.service_proxy_auth,
+ mkws_config.service_proxy_auth_domain);
if (mkws_config.responsive_design_width) {
// Responsive web design - change layout on the fly based on
@@ -767,13 +766,13 @@ function mkws_html_perpage() {
* The username/password is configured in the apache config file
* for the site.
*/
-function mkws_service_proxy_auth(auth_url) {
+function mkws_service_proxy_auth(auth_url, auth_domain) {
debug("Run service proxy auth URL: " + auth_url);
var request = new pzHttpRequest(auth_url, function(err) {
- alert("HTTP call for authentication failed: " + err)
- return;
- });
+ alert("HTTP call for authentication failed: " + err)
+ return;
+ }, auth_domain);
request.get(null, function(data) {
if (!$.isXMLDoc(data)) {