diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index 781a08a2ad..70d8b148a8 100644 --- a/public/js/controllers/settingsCtrl.js +++ b/public/js/controllers/settingsCtrl.js @@ -65,13 +65,8 @@ habitrpg.controller('SettingsCtrl', User.set({'preferences.language': $scope.language.code}); } - $scope.availableFormats = ['MM/dd/yyyy','dd/MM/yyyy']; - $scope.changeDateFormat = function(){ - - var dateFormat= User.user.preferences.dateFormat; - User.set({'preferences.dateFormat': dateFormat}); - } - + $scope.availableFormats = ['MM/dd/yyyy','dd/MM/yyyy']; + $scope.reroll = function(){ User.user.ops.reroll({}); $rootScope.$state.go('tasks'); diff --git a/src/models/user.js b/src/models/user.js index 233fa9015a..1c97b34a4e 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -279,7 +279,7 @@ var UserSchema = new Schema({ allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'}, costume: Boolean, dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy'], 'default': 'MM/dd/yyyy'}, - sleep: {type: Boolean, 'default': false}, + sleep: {type: Boolean, 'default': false}, stickyHeader: {type: Boolean, 'default': true}, disableClasses: {type: Boolean, 'default': false}, newTaskEdit: {type: Boolean, 'default': false}, diff --git a/views/options/settings.jade b/views/options/settings.jade index a6382ab468..e8e50b2405 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -39,9 +39,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .form-horizontal h5=env.t('dateFormat') - select.form-control(ng-model='user.preferences.dateFormat', ng-options='DF for DF in availableFormats', ng-change='changeDateFormat()') - - + select.form-control(ng-model='user.preferences.dateFormat', ng-options='DF for DF in availableFormats', ng-change='set({"preferences.dateFormat": user.preferences.dateFormat})') .checkbox label input(type='checkbox', ng-click='hideHeader() ', ng-checked='user.preferences.hideHeader!==true')