dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11651
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-13 16:06:11 +0700
message:
  Minor fixed.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/TabularReportColumn.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.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 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/TabularReportColumn.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/TabularReportColumn.java	2013-08-13 06:11:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/TabularReportColumn.java	2013-08-13 09:06:11 +0000
@@ -1,5 +1,6 @@
 package org.hisp.dhis.patientreport;
 
+
 public class TabularReportColumn
 {
     public static String PREFIX_META_DATA = "meta";

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-08-13 06:11:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-08-13 09:06:11 +0000
@@ -71,20 +71,25 @@
 
 <div id='advanced-search' name='advanced-search' class='hidden advanced-search'>
 	<table>	
-		#if( $auth.hasAccess( "dhis-web-caseentry", "searchAllFacilities" ) )
-			<tr id='searchBySelectedUnitTD'>
+		<tr id='searchBySelectedUnitTD'>
+			 #if( $auth.hasAccess( "dhis-web-caseentry", "searchAllFacilities" ) )
 				<td>
 					$i18n.getString('search_in_all_facilities') 
 					<input type='checkbox' id='searchInAllFacility' name='searchInAllFacility' />&nbsp;&nbsp;&nbsp;
 				</td>
+			 #else
+					 <input type='checkbox' class='hidden' id='searchInAllFacility' name='searchInAllFacility' />
+			 #end
+			 
+			 #if( $auth.hasAccess( "dhis-web-caseentry", "searchByUserFacilities" ) )
 				<td>
 					$i18n.getString('search_by_user_orgunits') 
 					<input type='checkbox' id='searchByUserOrgunits' name='searchByUserOrgunits' />&nbsp;&nbsp;&nbsp;
 				</td>
-			</tr>
-		#else
-			<input type='checkbox' class='hidden' id='searchInAllFacility' name='searchInAllFacility' />
-		#end
+			#else
+				<input type='checkbox' class='hidden' id='searchByUserOrgunits' name='searchByUserOrgunits' />
+			#end
+		</tr>
 		<tr id='dueDateTR' class='hidden'>
 			<td>$i18n.getString('due_date_from_to')</td>
 			<td>