dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21677
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2016-01-09 12:23:51 +0100
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java


--
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-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java	2016-01-08 16:27:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java	2016-01-09 11:23:51 +0000
@@ -85,7 +85,7 @@
     private AttributeService attributeService;
 
     @Autowired
-    private DhisConfigurationProvider dhisConfigurationProvider;
+    private DhisConfigurationProvider configurationProvider;
 
     // -------------------------------------------------------------------------
     // Input/Output
@@ -154,9 +154,11 @@
         return trackedEntities;
     }
 
+    private boolean encryptionAvailable;
+    
     public boolean isEncryptionAvailable()
     {
-        return dhisConfigurationProvider.isEncryptionConfigured().isOk();
+        return encryptionAvailable;
     }
 
     // -------------------------------------------------------------------------
@@ -176,7 +178,9 @@
             programs.removeAll( programService.getPrograms( ProgramType.WITHOUT_REGISTRATION ) );
             Collections.sort( programs );
         }
-
+        
+        encryptionAvailable = configurationProvider.isEncryptionConfigured().isOk();
+        
         periodTypes = periodService.getAllPeriodTypes();
         optionSets = optionService.getAllOptionSets();
         legendSets = legendService.getAllLegendSets();