From 25bbd36ee11c44322e53dfe35f5d0d733f73be30 Mon Sep 17 00:00:00 2001
From: John Woodlock <john.woodlock@gmail.com>
Date: Tue, 29 May 2012 12:05:05 +1000
Subject: [PATCH] fix viewing of additional data after saving

---
 .../static/{stretchydata-0.947.js => stretchydata-0.95.js} | 7 ++++---
 .../src/main/webapp/WEB-INF/views/common-head.jsp          | 2 +-
 .../platform/ReadExtraDataAndReportingServiceImpl.java     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/{stretchydata-0.947.js => stretchydata-0.95.js} (98%)

diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.947.js b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.95.js
similarity index 98%
rename from mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.947.js
rename to mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.95.js
index d86cf0ed0..610a260aa 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.947.js
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.95.js
@@ -158,7 +158,7 @@
 	}
 	;
 	viewExtraDataErrorFunction = function(jqXHR, textStatus, errorThrown) {
-		alert(jqXHR.responseText);
+		alert("err: " + jqXHR.responseText);
 	};
 
 	function viewExtraData(url, basicAuthKey, datasetType, datasetName, datasetPKValue, dsnDivName) {
@@ -174,7 +174,6 @@
 	}
 
 	popupEditErrorFunction = function(jqXHR, textStatus, errorThrown) {
-		alert("error");
 		handleXhrError(jqXHR, textStatus, errorThrown, "#formErrorsTemplate", "#formerrors");
 	};
 	popupEditSuccessFunction = function(data, textStatus, jqXHR) {
@@ -392,7 +391,7 @@
 				},
 				success : function(data, textStatus, jqXHR) {
 					currentEditPopup.dialogDiv.dialog("close");
-					viewExtraData(currentEditPopup.baseUrl,
+					viewExtraData(currentEditPopup.baseUrl, basicAuthKey, 
 							currentEditPopup.datasetType,
 							currentEditPopup.datasetName,
 							currentEditPopup.datasetPKValue,
@@ -468,6 +467,8 @@
 
 	function handleXhrError(jqXHR, textStatus, errorThrown, templateSelector,
 			placeholderDiv) {
+		
+		alert("Status: " + jqXHR.status + "     textStatus: " + textStatus + "     errorThrown: " + errorThrown + "     templateSelector: " + templateSelector + "     placeholderDiv: " + placeholderDiv);
 		if (jqXHR.status === 0) {
 			alert('Not connect.\n Verify Network.');
 		} else if (jqXHR.status == 404) {
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 ab4fac237..2ec3c85f9 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 @@
 <script type="text/javascript" src="${resValue}/libs/jquery.views.js"></script>
 <script type="text/javascript" src="${resValue}/libs/jquery.observable.min.js"></script>
 <script type="text/javascript" src="${resValue}/libs/globalize/globalize.js"></script>
-<script type="text/javascript" src="${resValue}/stretchydata-0.947.js"></script>
+<script type="text/javascript" src="${resValue}/stretchydata-0.95.js"></script>
 
 <c:choose>
   <c:when test="${not empty language}">
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
index aac3d6611..d33e640e1 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
@@ -433,9 +433,9 @@ public class ReadExtraDataAndReportingServiceImpl implements
 					rsch.setColumnLength(rsmd.getInt("data_length"));
 					rsch.setColumnDisplayType(rsmd.getString("display_type"));
 					allowedListId = rsmd.getInt("allowed_list_id");
-					if (allowedListId != null) {
+					if (allowedListId > 0) {
 
-						logger.info("allowedListId != null: Column: " + rsch.getColumnName());
+						//logger.info("allowedListId != null: Column: " + rsch.getColumnName());
 						sql = "select v.`name` from stretchydata_allowed_value v where allowed_list_id = "
 								+ allowedListId + " order by id";
 						ResultSet rsValues = db_statement2.executeQuery(sql);