← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6275: local vn - Fixed and Upgrade hibernate version in web.xml

 

------------------------------------------------------------
revno: 6275
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-03-16 14:09:48 +0700
message:
  local vn - Fixed and Upgrade hibernate version in web.xml
modified:
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/WEB-INF/web.xml
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js
  local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/WEB-INF/web.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/WEB-INF/web.xml	2011-07-28 09:50:39 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/WEB-INF/web.xml	2012-03-16 07:09:48 +0000
@@ -23,7 +23,7 @@
   </filter>
   <filter>
     <filter-name>OpenSessionInViewFilter</filter-name>
-    <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
+    <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class>
   </filter>
   <filter>
     <filter-name>springSecurityFilterChain</filter-name>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/exportItems.js	2012-03-16 07:09:48 +0000
@@ -239,7 +239,7 @@
 	itemsDuplicated = new Array();
 	
 	jQuery.postJSON( "getExportItemsBySheet.action", {
-		exportReportId: getFieldValue( "targetExportReport" );
+		exportReportId: getFieldValue( "targetExportReport" ),
 		sheetNo: sheetId
 	}, function( json ) {
 		var items = json.exportItems;
@@ -503,7 +503,7 @@
 
 function filterIndicators()
 {
-	jQuery.postJSON( "../dhis-web-commons-ajax-json/getIndicators.action" {
+	jQuery.postJSON( "../dhis-web-commons-ajax-json/getIndicators.action", {
 		id: $("#indicatorGroups").val()
 	}, function( json ) {
 		var indiatorList = byId( "availableIndicators" );

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm	2012-02-03 08:38:42 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/report/exportItems.vm	2012-03-16 07:09:48 +0000
@@ -1,5 +1,5 @@
 <script>
-	jQuery(document).ready(function(){	
+	jQuery(document).ready(function(){
 		tableSorter( 'listTable', [[1,0]] );
 		
 		dialog1 = setUpDialog( 'copyToExportReport', i18n_copy_to_exportreport, 420, 170 );