dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2317
committer: Mithilesh Kumar Thakur<mithilesh.hisp@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-10-05 12:32:25 +0530
message:
  Minor Bug Fixed in Data Locking
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/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-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java	2010-08-18 08:04:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/CollectiveDataLockingAction.java	2010-10-05 07:02:25 +0000
@@ -188,13 +188,13 @@
 
     private String unlock = "unlock";
 
-    private String select_all_at_level = "Select all at level";
-
-    private String unselect_all_at_level = "Unselect all at level";
-
-    private String select_all_in_group = "Select all in group";
-
-    private String unselect_all_in_group = "Unselect all in group";
+    private String lock_all_at_level = "Lock all at level";
+
+    private String unlock_all_at_level = "Unlock all at level";
+
+    private String lock_all_in_group = "Lock all in group";
+
+    private String unlock_all_in_group = "Unlock all in group";
 
     public String execute()
     {
@@ -229,7 +229,7 @@
         Collection<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>();
         Set<Source> selectedOrganisationUnitsSource = new HashSet<Source>();
 
-        if ( selectBetweenLockUnlock.equalsIgnoreCase( select_all_at_level ) )
+        if ( selectBetweenLockUnlock.equalsIgnoreCase( lock_all_at_level ) )
         {
             organisationUnits = organisationUnitService.getOrganisationUnitsAtLevel( levelId.intValue() );
             selectedOrganisationUnitsSource = getCurrentUserOrgnaisationUnits();
@@ -241,7 +241,7 @@
             return SUCCESS;
 
         }
-        else if ( selectBetweenLockUnlock.equalsIgnoreCase( unselect_all_at_level ) )
+        else if ( selectBetweenLockUnlock.equalsIgnoreCase( unlock_all_at_level ) )
         {
             organisationUnits = organisationUnitService.getOrganisationUnitsAtLevel( levelId.intValue() );
             selectedOrganisationUnitsSource = getCurrentUserOrgnaisationUnits();
@@ -253,7 +253,7 @@
             return SUCCESS;
         }
 
-        if ( selectBetweenLockUnlock.equalsIgnoreCase( select_all_in_group ) )
+        if ( selectBetweenLockUnlock.equalsIgnoreCase( lock_all_in_group ) )
         {
             organisationUnits = organisationUnitGroupService.getOrganisationUnitGroup( orgGroup.intValue() )
                 .getMembers();
@@ -265,7 +265,7 @@
 
             return SUCCESS;
         }
-        else if ( selectBetweenLockUnlock.equalsIgnoreCase( unselect_all_in_group ) )
+        else if ( selectBetweenLockUnlock.equalsIgnoreCase( unlock_all_in_group ) )
         {
             organisationUnits = organisationUnitGroupService.getOrganisationUnitGroup( orgGroup.intValue() )
                 .getMembers();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-10-05 05:20:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-10-05 07:02:25 +0000
@@ -283,10 +283,10 @@
 unlock                                  						    = Unlock
 period_not_selected     											= Select Avaliable Period
 dataset_not_selected												= Select Avaliable data sets 
-select_all_at_level_saved  											= Select All at Level Saved
-unselect_all_at_level_saved											= Unselect	All at Level Saved
-select_all_in_group_saved											= Select All at Group Saved 
-unselect_all_in_group_saved											= Unselect All at Group Saved
+select_all_at_level_saved  											= Lock All at Level Saved
+unselect_all_at_level_saved											= Unlock All at Level Saved
+select_all_in_group_saved											= Lock All at Group Saved 
+unselect_all_in_group_saved											= Unlock All at Group Saved
 information_successfully_locked										= Data Successfully Locked
 information_successfully_unlocked									= Data Successfully Unlocked
 organisation_unit_not_selected										= Please select an organisation unit
@@ -311,4 +311,5 @@
 process_started                                                     = Checking...
 sqlview_process_canceled_interrupted                                = WARNING: This query could retrieve a large amount of data from database.\n\nDo you want to save it...? =======
 generate_values_success                                             = Generate values successfully
-organisation_not_selected                                           = WARNING: There is no organisation unit selected
\ No newline at end of file
+organisation_not_selected                                           = WARNING: There is no organisation unit selected
+organisation_not_selected                                           =	OrganisationUnit not selected
\ No newline at end of file