------------------------------------------------------------ revno: 21702 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Tue 2016-01-12 14:06:50 +0100 message: Renamed user setting currentStyle to keyStyle modified: 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/startup/TableAlteror.java dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
-- 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/user/UserSettingKey.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java 2016-01-12 12:49:50 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java 2016-01-12 13:06:50 +0000 @@ -39,7 +39,7 @@ */ public enum UserSettingKey { - STYLE( "currentStyle" ), + STYLE( "keyStyle" ), MESSAGE_EMAIL_NOTIFICATION( "keyMessageEmailNotification", Boolean.FALSE, Boolean.class ), MESSAGE_SMS_NOTIFICATION( "keyMessageSmsNotification", Boolean.FALSE, Boolean.class ), UI_LOCALE( "keyUiLocale", Locale.class ), === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2016-01-11 17:41:23 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2016-01-12 13:06:50 +0000 @@ -718,6 +718,7 @@ executeSql( "delete from usersetting where name = 'dashboardConfig' or name = 'dashboardConfiguration'" ); executeSql( "update usersetting set name = 'keyUiLocale' where name = 'currentLocale'" ); executeSql( "update usersetting set name = 'keyDbLocale' where name = 'keyLocaleUserSetting'" ); + executeSql( "update usersetting set name = 'keyStyle' where name = 'currentStyle'" ); executeSql( "ALTER TABLE interpretation ALTER COLUMN userid DROP NOT NULL" ); executeSql( "UPDATE interpretation SET publicaccess='r-------' WHERE publicaccess IS NULL;" ); === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2016-01-03 23:02:49 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2016-01-12 13:06:50 +0000 @@ -10,7 +10,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link type="text/css" rel="stylesheet" href="../dhis-web-commons/font-awesome/css/font-awesome.min.css?_rev=$!{buildRevision}" /> <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css?_rev=$!{buildRevision}" /> - <link type="text/css" rel="stylesheet" media="screen,print" href="../dhis-web-commons/css/${currentStyle}?_rev=$!{buildRevision}" /> + <link type="text/css" rel="stylesheet" media="screen,print" href="../dhis-web-commons/css/${keyStyle}?_rev=$!{buildRevision}" /> <link type="text/css" rel="stylesheet" media="screen,print" href="../dhis-web-commons/css/widgets.css?_rev=$!{buildRevision}" /> <link type="text/css" rel="stylesheet" media="print" href="../dhis-web-commons/css/print.css?_rev=$!{buildRevision}" /> <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/menu.css?_rev=$!{buildRevision}" />
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp