From 9f686e7e808eedbdd0e1fb7b99ef9b054572a48a Mon Sep 17 00:00:00 2001 From: John Woodlock Date: Fri, 18 May 2012 14:32:55 +1000 Subject: [PATCH] WIP patching in username/password for basic auth in reporting/additional fields --- ...tchydata-0.94.js => stretchydata-0.945.js} | 79 ++++++++++++------- ...ing-0.98.js => stretchyreporting-0.985.js} | 8 +- .../views/common-head-stretchyreporting.jsp | 2 +- .../main/webapp/WEB-INF/views/common-head.jsp | 2 +- 4 files changed, 58 insertions(+), 33 deletions(-) rename mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/{stretchydata-0.94.js => stretchydata-0.945.js} (90%) rename mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/{stretchyreporting-0.98.js => stretchyreporting-0.985.js} (99%) diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.94.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.945.js similarity index 90% rename from mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.94.js rename to mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.945.js index b6a4d0210..db152dc56 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.94.js +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.945.js @@ -4,6 +4,8 @@ $.stretchyData.displayAllExtraData = function(params) { + username="mifos"; + password="password"; if (!(params.url)) { alert(doI18N("reportingInitError - url parameter")); return; @@ -52,23 +54,28 @@ var extraDataNamesVar = ""; for ( var i in data.additionalFieldsSets) { - var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv); + var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, + displayAllVars.datasetTypeDiv); extraDataNamesVar += '
' + doI18N(displayAllVars.headingPrefix) - + doI18N(data.additionalFieldsSets[i].name) + ' - '; + + doI18N(data.additionalFieldsSets[i].name) + + ' - '; extraDataNamesVar += editExtraDataLink(displayAllVars.url, - displayAllVars.datasetType, data.additionalFieldsSets[i].name, + displayAllVars.datasetType, + data.additionalFieldsSets[i].name, displayAllVars.datasetPKValue, dsnDivName); - + extraDataNamesVar += '
'; extraDataNamesVar += '
'; } $('#' + displayAllVars.datasetTypeDiv).html(extraDataNamesVar); for ( var i in data.additionalFieldsSets) { - var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, displayAllVars.datasetTypeDiv); + var dsnDivName = generateDsnDivName(displayAllVars.datasetType, i, + displayAllVars.datasetTypeDiv); viewExtraData(displayAllVars.url, displayAllVars.datasetType, - data.additionalFieldsSets[i].name, displayAllVars.datasetPKValue, dsnDivName); + data.additionalFieldsSets[i].name, + displayAllVars.datasetPKValue, dsnDivName); } }; @@ -157,8 +164,9 @@ function viewExtraData(url, datasetType, datasetName, datasetPKValue, dsnDivName) { - var viewExtraDataUrl = url + "api/v1/additionalfields/" + encodeURIComponent(datasetType) - + "/" + encodeURIComponent(datasetName) + "/" + var viewExtraDataUrl = url + "api/v1/additionalfields/" + + encodeURIComponent(datasetType) + "/" + + encodeURIComponent(datasetName) + "/" + encodeURIComponent(datasetPKValue); var evalViewExtraDataSuccessFunction = "var viewExtraDataSuccessFunction = function(data, textStatus, jqXHR){ viewExtraDataset(data, '" @@ -191,7 +199,8 @@ datasetName : datasetName, datasetPKValue : datasetPKValue, baseUrl : url, - url : url + "api/v1/additionalfields/" + encodeURIComponent(datasetType) + "/" + url : url + "api/v1/additionalfields/" + + encodeURIComponent(datasetType) + "/" + encodeURIComponent(datasetName) + "/" + encodeURIComponent(datasetPKValue) }; @@ -200,7 +209,8 @@ } function generateDsnDivName(datasetType, i, uniqueDivid) { - return extraDataUnderscore(datasetType) + "_" + i + "_" + extraDataUnderscore(uniqueDivid); + return extraDataUnderscore(datasetType) + "_" + i + "_" + + extraDataUnderscore(uniqueDivid); } /* start of code to fill data in edit form */ @@ -342,23 +352,22 @@ } } - $.fn.serializeObject = function() - { - var o = {}; - var a = this.serializeArray(); - $.each(a, function() { - if (o[this.name] !== undefined) { - if (!o[this.name].push) { - o[this.name] = [o[this.name]]; - } - o[this.name].push(this.value || ''); - } else { - o[this.name] = this.value || ''; - } - }); - return o; + $.fn.serializeObject = function() { + var o = {}; + var a = this.serializeArray(); + $.each(a, function() { + if (o[this.name] !== undefined) { + if (!o[this.name].push) { + o[this.name] = [ o[this.name] ]; + } + o[this.name].push(this.value || ''); + } else { + o[this.name] = this.value || ''; + } + }); + return o; }; - + function extraDataOpenDialog(url) { // var saveButton = jQuery.i18n.prop('dialog.button.save'); @@ -373,7 +382,7 @@ }); var form_data = JSON.stringify($('#entityform').serializeObject()); - //console.log(form_data); + // console.log(form_data); var jqxhr = $.ajax({ url : url, type : 'POST', @@ -382,7 +391,12 @@ // crossDomain : true, dataType : 'json', data : form_data, - cache: false, + cache : false, + beforeSend : function(xhr) { + var base64 = $.base64Encode(username + ":" + password); + console.log("base64: " + base64); + xhr.setRequestHeader("Authorization", "Basic " + base64); + }, success : function(data, textStatus, jqXHR) { currentEditPopup.dialogDiv.dialog("close"); viewExtraData(currentEditPopup.baseUrl, @@ -450,11 +464,16 @@ cache : false, type : 'GET', contentType : "application/json; charset=utf-8", - cache: false, + cache : false, + beforeSend : function(xhr) { + var base64 = $.base64Encode(username + ":" + password); + console.log("base64: " + base64); + xhr.setRequestHeader("Authorization", "Basic " + base64); + }, // dataType : 'jsonp', // crossDomain : true, dataType : 'json', - //crossDomain : false, + // crossDomain : false, success : successFunction, error : errorFunction }); diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.98.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.985.js similarity index 99% rename from mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.98.js rename to mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.985.js index 4975815e3..d104ff404 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.98.js +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchyreporting/stretchyreporting-0.985.js @@ -3,6 +3,8 @@ $.stretchyReporting = {}; $.stretchyReporting.initialise = function(params) { + username="mifos"; + password="password"; initialiseReporting(params) }; @@ -977,6 +979,7 @@ function getReportData(rptName, inParams, successFunction, isParameterType) { function getReportDataAuth(rptName, inParams, successFunction, isParameterType) { alert("needs fixing up, dont rely on data") +return var inQueryParameters = {}; for (var i in inParams ) inQueryParameters["R_" + i] = inParams[i]; if (rptDB > "") inQueryParameters["R_rptDB"] = rptDB; @@ -1053,8 +1056,11 @@ function getReportDataNoAuth(rptName, inParams, successFunction, isParameterType contentType: "application/json; charset=utf-8", crossDomain: false, cache: false, - beforeSend: function( xhr ) { + beforeSend : function(xhr) { xhr.setRequestHeader("Accept", "application/json"); + var base64 = $.base64Encode(username + ":" + password); + console.log("base64: " + base64); + xhr.setRequestHeader("Authorization", "Basic " + base64); }, success: successFunction, error:function(jqXHR, textStatus, errorThrown){ diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp index 0a0272c31..5b8b07dd5 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head-stretchyreporting.jsp @@ -15,7 +15,7 @@ - + diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp index ae46124a5..090edae4b 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp @@ -34,7 +34,7 @@ - +