Merge authors:
Stian Sandvold (stian-sandvold)
revision-diff.txt (15.5 KB)
···
------------------------------------------------------------
revno: 21916 [merge]
committer: Stian Sandvold <stian.sandvold@gmail.com>
branch nick: dhis2
timestamp: Tue 2016-02-09 16:35:42 +0100
message:
Renamed systemSetting *currentStyle* to *keyStyle* to follow convetions and to be equal to the userSettingKey; Removed all default values for UserSettingKeys; SystemSetting now works as a fallback for userSettings, if no userSetting can be found(null); if no usersetting is found, the set systemsetting is used, or the system setting default;
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SettingKey.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress