CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 55 Packages Projects Releases Wiki Activity

fix viewing of additional data after saving

Browse Source
This commit is contained in:
John Woodlock
2012-05-29 12:05:37 +10:00
parent 7282d3fe7d
commit 25bbd36ee1
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.947.js → mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/stretchydata-0.95.js
+4 -3
View File
@@ -158,7 +158,7 @@
} }
; ;
viewExtraDataErrorFunction = function(jqXHR, textStatus, errorThrown) { viewExtraDataErrorFunction = function(jqXHR, textStatus, errorThrown) {
alert(jqXHR.responseText); alert("err: " + jqXHR.responseText);
}; };
function viewExtraData(url, basicAuthKey, datasetType, datasetName, datasetPKValue, dsnDivName) { function viewExtraData(url, basicAuthKey, datasetType, datasetName, datasetPKValue, dsnDivName) {
@@ -174,7 +174,6 @@
} }
popupEditErrorFunction = function(jqXHR, textStatus, errorThrown) { popupEditErrorFunction = function(jqXHR, textStatus, errorThrown) {
alert("error");
handleXhrError(jqXHR, textStatus, errorThrown, "#formErrorsTemplate", "#formerrors"); handleXhrError(jqXHR, textStatus, errorThrown, "#formErrorsTemplate", "#formerrors");
}; };
popupEditSuccessFunction = function(data, textStatus, jqXHR) { popupEditSuccessFunction = function(data, textStatus, jqXHR) {
@@ -392,7 +391,7 @@
}, },
success : function(data, textStatus, jqXHR) { success : function(data, textStatus, jqXHR) {
currentEditPopup.dialogDiv.dialog("close"); currentEditPopup.dialogDiv.dialog("close");
viewExtraData(currentEditPopup.baseUrl, viewExtraData(currentEditPopup.baseUrl, basicAuthKey,
currentEditPopup.datasetType, currentEditPopup.datasetType,
currentEditPopup.datasetName, currentEditPopup.datasetName,
currentEditPopup.datasetPKValue, currentEditPopup.datasetPKValue,
@@ -468,6 +467,8 @@
function handleXhrError(jqXHR, textStatus, errorThrown, templateSelector, function handleXhrError(jqXHR, textStatus, errorThrown, templateSelector,
placeholderDiv) { placeholderDiv) {
alert("Status: " + jqXHR.status + " textStatus: " + textStatus + " errorThrown: " + errorThrown + " templateSelector: " + templateSelector + " placeholderDiv: " + placeholderDiv);
if (jqXHR.status === 0) { if (jqXHR.status === 0) {
alert('Not connect.\n Verify Network.'); alert('Not connect.\n Verify Network.');
} else if (jqXHR.status == 404) { } else if (jqXHR.status == 404) {
mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/common-head.jsp
+1 -1
View File
@@ -34,7 +34,7 @@
<script type="text/javascript" src="${resValue}/libs/jquery.views.js"></script> <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/jquery.observable.min.js"></script>
<script type="text/javascript" src="${resValue}/libs/globalize/globalize.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:choose>
<c:when test="${not empty language}"> <c:when test="${not empty language}">
mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
+2 -2
View File
@@ -433,9 +433,9 @@ public class ReadExtraDataAndReportingServiceImpl implements
rsch.setColumnLength(rsmd.getInt("data_length")); rsch.setColumnLength(rsmd.getInt("data_length"));
rsch.setColumnDisplayType(rsmd.getString("display_type")); rsch.setColumnDisplayType(rsmd.getString("display_type"));
allowedListId = rsmd.getInt("allowed_list_id"); 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 = " sql = "select v.`name` from stretchydata_allowed_value v where allowed_list_id = "
+ allowedListId + " order by id"; + allowedListId + " order by id";
ResultSet rsValues = db_statement2.executeQuery(sql); ResultSet rsValues = db_statement2.executeQuery(sql);