From 331c8831f93e2c5cf9d31c2880c5f0e9d13617f1 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Sun, 27 May 2012 11:58:58 +0100 Subject: [PATCH] fix notes ui with new json. --- .../webapp/WEB-INF/views/client/viewClientAccount.jsp | 8 ++------ .../src/main/webapp/WEB-INF/views/view-templates.jsp | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp index fa686d37f..3832bae3a 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp @@ -346,7 +346,6 @@ $(document).ready(function() { }).dialog('open'); } - // function popupDialogWithFormView(getUrl, postUrl, submitType, titleCode, templateSelector, width, height, tabIndex, minOffset, defaultOffset, maxOffset) { function popupDialogWithFormView(getUrl, postUrl, submitType, titleCode, templateSelector, width, height, saveSuccessFunction) { var dialogDiv = $("
"); var jqxhr = $.ajax({ @@ -356,11 +355,10 @@ $(document).ready(function() { dataType: 'json', cache: false, beforeSend: function(xhr) { - console.log("base64: " + base64); xhr.setRequestHeader("Authorization", "Basic " + base64); }, success: function(data, textStatus, jqXHR) { - console.log(data); + var formHtml = $(templateSelector).render(data); dialogDiv.append(formHtml); @@ -389,7 +387,6 @@ $(document).ready(function() { dataType: 'json', data: newFormData, beforeSend: function(xhr) { - console.log("base64: " + base64); xhr.setRequestHeader("Authorization", "Basic " + base64); }, success: saveSuccessFunction, @@ -784,7 +781,6 @@ $(document).ready(function() { dataType: 'json', cache: false, beforeSend: function(xhr) { - console.log("base64: " + base64); xhr.setRequestHeader("Authorization", "Basic " + base64); }, success: function(data, textStatus, jqXHR) { @@ -792,7 +788,7 @@ $(document).ready(function() { var noteParent = new Object(); noteParent.title = jQuery.i18n.prop('widget.notes.heading'); - noteParent.items = data.notes; + noteParent.notes = data; var tableHtml = $("#noteListViewTemplate").render(noteParent); $("#clienttabrightpane").html(tableHtml); diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp index d1f16bb8c..832503c3c 100644 --- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp +++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp @@ -265,7 +265,7 @@