dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11804
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-27 10:31:40 +0700
message:
  Remove authority Search-by-users-orgunit in system. Only add an option into advanced-search person.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties


--
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-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2013-08-26 13:01:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java	2013-08-27 03:31:40 +0000
@@ -623,4 +623,4 @@
 
         return outboundSms;
     }
-}
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-08-26 13:01:59 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-08-27 03:31:40 +0000
@@ -2536,4 +2536,4 @@
             + "       and (  DATE(now()) - DATE(psi.duedate) ) = prm.daysallowedsendmessage "
             + "       and prm.whentosend is null " + "       and prm.sendto = " + PatientReminder.SEND_TO_USER_GROUP;
     }
-}
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-08-19 06:54:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-08-27 03:31:40 +0000
@@ -37,12 +37,6 @@
       <param name="requiredAuthorities">F_SEARCH_PATIENT_IN_ALL_FACILITIES</param>
     </action>
     
-     <action name="searchByUserFacilities"
-      class="org.hisp.dhis.caseentry.action.NoAction">
-      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="requiredAuthorities">F_SEARCH_PATIENT_IN_USER_FACILITIES</param>
-    </action>
-
     <action name="searchPatient"
       class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">
       <result name="success" type="velocity">/content.vm</result>

=== 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 09:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-08-27 03:31:40 +0000
@@ -81,14 +81,11 @@
 					 <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>
-			#else
-				<input type='checkbox' class='hidden' id='searchByUserOrgunits' name='searchByUserOrgunits' />
-			#end
+			<td>
+				$i18n.getString('search_by_user_orgunits') 
+				<input type='checkbox' id='searchByUserOrgunits' name='searchByUserOrgunits' />&nbsp;&nbsp;&nbsp;
+			</td>
+		
 		</tr>
 		<tr id='dueDateTR' class='hidden'>
 			<td>$i18n.getString('due_date_from_to')</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-08-22 17:09:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-08-27 03:31:40 +0000
@@ -131,7 +131,6 @@
 F_ADD_PROGRAM_INDICATOR = Add/Update Program Indicator
 F_PATIENT_CHANGE_LOCATION = Change Person Location
 F_SEARCH_PATIENT_IN_ALL_FACILITIES = Search Person In All Facilities
-F_SEARCH_PATIENT_IN_USER_FACILITIES = Search Person In User Facilities
 F_ADD_PATIENT_REGISTRATION_FORM=Add Person Registration Form
 F_PROGRAM_INSTANCE_MANAGEMENT = Program Event Management
 F_PROGRAM_INSTANCE_DELETE = Delete Program Enrollment