dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10383
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-21 15:07:18 +0100
message:
  Debug code
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/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-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-03-21 13:53:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-03-21 14:07:18 +0000
@@ -230,14 +230,11 @@
      */
     public static boolean canRead( User user, IdentifiableObject object )
     {
-        System.err.println( "TRYING TO READ: " + object );
-
         if ( sharingOverrideAuthority( user )
             || object.getUser() == null
             || user.equals( object.getUser() )
             || AccessStringHelper.canRead( object.getPublicAccess() ) )
         {
-            System.err.println("CAN READ");
             return true;
         }
 
@@ -246,12 +243,10 @@
             if ( AccessStringHelper.canRead( userGroupAccess.getAccess() )
                 && userGroupAccess.getUserGroup().getMembers().contains( user ) )
             {
-                System.err.println("CAN READ");
                 return true;
             }
         }
 
-        System.err.println("CAN NOT READ");
         return false;
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2013-03-19 16:20:36 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2013-03-21 14:07:18 +0000
@@ -734,7 +734,6 @@
         return chartStore.save( chart );
     }
 
-    @Override
     public void updateChart( Chart chart )
     {
         chartStore.update( chart );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2013-01-23 09:08:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2013-03-21 14:07:18 +0000
@@ -57,4 +57,4 @@
 enable_user_account_recovery=Enable user account recovery
 select_organisation_unit=Select organisation unit
 application_notification=Application notification
-multi_organisation_unit_forms=Enable multi organisation unit forms
+multi_organisation_unit_forms=Enable multi-organisation unit forms