diff --git a/src/controllers/user.js b/src/controllers/user.js index bd167da816..f0f1f72cbe 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -166,9 +166,11 @@ acceptablePUTPaths = _.reduce(require('./../models/user').schema.paths, function if (found) m[leaf]=true; return m; }, {}) -_.each('stats.gp'.split(' '), function(removePath){ - delete acceptablePUTPaths[removePath]; -}) + +//// Uncomment this if we we want to disable GP-restoring (eg, holiday events) +//_.each('stats.gp'.split(' '), function(removePath){ +// delete acceptablePUTPaths[removePath]; +//}) /** * Update user diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade index b2012f2b19..d4c04fdf38 100644 --- a/views/shared/modals/settings.jade +++ b/views/shared/modals/settings.jade @@ -24,11 +24,11 @@ div(ng-controller='SettingsCtrl') .option-group.option-medium input.option-content(type='number', step="any", data-for='stats.exp', ng-model='restoreValues.stats.exp') span.input-suffix=env.t('experience') - .option-group.option-medium(ng-if='!user.purchased.plan.customerId') - //input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp') - input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled) + .option-group.option-medium + input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp') + //input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled) span.input-suffix=env.t('gold') - p.alert + //-p.alert small=env.t('disabledWinterEvent') .option-group.option-medium input.option-content(type='number', step="any", data-for='stats.mp', ng-model='restoreValues.stats.mp')