=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-10-11 06:11:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-10-11 09:24:58 +0000
@@ -1604,7 +1604,7 @@
// Paging
p.page = TR.state.currentPage;
-
+
// Get searching values
p.dimension = [];
@@ -1853,29 +1853,25 @@
success: function(r) {
var json = Ext.JSON.decode(r.responseText);
- if( TR.state.asc != "" || TR.state.desc != "" ){
- TR.store.datatable.loadData(TR.value.values,false);
- }
- else{
- TR.value.columns = json.headers;
- TR.value.values = json.rows;
- TR.state.total = json.metaData.pager.total;
- TR.state.pageCount = json.metaData.pager.pageCount;
-
- // Get fields
-
- var fields = [];
- for( var index=0; index < TR.value.columns.length; index++ )
- {
- fields[index] = TR.value.columns[index].name;
- }
- TR.value.fields = fields;
-
- // Set data for grid
-
- TR.store.getDataTableStore();
- TR.datatable.getDataTable();
- }
+ TR.value.columns = json.headers;
+ TR.value.values = json.rows;
+ TR.state.total = json.metaData.pager.total;
+ TR.state.pageCount = json.metaData.pager.pageCount;
+
+ // Get fields
+
+ var fields = [];
+ for( var index=0; index < TR.value.columns.length; index++ )
+ {
+ fields[index] = TR.value.columns[index].name;
+ }
+ TR.value.fields = fields;
+
+ // Set data for grid
+
+ TR.store.getDataTableStore();
+ TR.datatable.getDataTable();
+
TR.datatable.setPagingToolbarStatus();
TR.util.mask.hideMask();
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-09-27 17:04:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-10-11 09:24:58 +0000
@@ -46,9 +46,9 @@
#end
#if( $auth.hasAccess( "dhis-web-maintenance-patient", "programIndicator" ) && $program.type !='3' )
-
+
#else
-
+
#end
#if ( $security.canManage( $program ) )