krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove unnecessary flags.contributor property from user

Browse Source 
Closes #7550
This commit is contained in:
Blade Barringer
2016-05-31 21:10:58 -05:00
parent c0d9c54c44
commit 52f0057c3d
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/integration/hall/PUT-hall_heores_heroId.test.js
View File

@@ -66,7 +66,6 @@ describe('PUT /heroes/:heroId', () => {
await hero.sync(); await hero.sync();
expect(hero.balance).to.equal(3 + 0.75); // 3+0.75 for first contrib level expect(hero.balance).to.equal(3 + 0.75); // 3+0.75 for first contrib level
expect(hero.contributor.level).to.equal(1); expect(hero.contributor.level).to.equal(1);
expect(hero.flags.contributor).to.equal(true);
expect(hero.purchased.ads).to.equal(true); expect(hero.purchased.ads).to.equal(true);
expect(hero.auth.blocked).to.equal(true); expect(hero.auth.blocked).to.equal(true);
}); });
@@ -95,7 +94,6 @@ describe('PUT /heroes/:heroId', () => {
await hero.sync(); await hero.sync();
expect(hero.balance).to.equal(1); // 0+1 for sixth contrib level expect(hero.balance).to.equal(1); // 0+1 for sixth contrib level
expect(hero.contributor.level).to.equal(6); expect(hero.contributor.level).to.equal(6);
expect(hero.flags.contributor).to.equal(true);
expect(hero.items.pets['Dragon-Hydra']).to.equal(5); expect(hero.items.pets['Dragon-Hydra']).to.equal(5);
}); });

4
website/client/js/controllers/notificationCtrl.js
View File

@@ -106,8 +106,8 @@ habitrpg.controller('NotificationCtrl',
$rootScope.openModal('achievements/rebirth', {controller:'UserCtrl', size: 'sm'}); $rootScope.openModal('achievements/rebirth', {controller:'UserCtrl', size: 'sm'});
}); });
$rootScope.$watch('user.flags.contributor', function(after, before){ $rootScope.$watch('user.contributor.level', function(after, before){
if (after === before || after !== true) return; if (after === before || after < before || after == null) return;
$rootScope.openModal('achievements/contributor',{controller:'UserCtrl'}); $rootScope.openModal('achievements/contributor',{controller:'UserCtrl'});
}); });

1
website/server/models/user.js
View File

@@ -201,7 +201,6 @@ export let schema = new Schema({
itemsEnabled: {type: Boolean, default: false}, itemsEnabled: {type: Boolean, default: false},
newStuff: {type: Boolean, default: false}, newStuff: {type: Boolean, default: false},
rewrite: {type: Boolean, default: true}, rewrite: {type: Boolean, default: true},
contributor: Boolean,
classSelected: {type: Boolean, default: false}, classSelected: {type: Boolean, default: false},
mathUpdates: Boolean, mathUpdates: Boolean,
rebirthEnabled: {type: Boolean, default: false}, rebirthEnabled: {type: Boolean, default: false},

3
website/views/shared/modals/achievements.jade
View File

@@ -106,7 +106,6 @@ script(id='modals/achievements/triadBingo.html', type='text/ng-template')
+achievementFooter +achievementFooter
// Contributor // Contributor
// activated by user.flags.contributor
script(id='modals/achievements/contributor.html', type='text/ng-template') script(id='modals/achievements/contributor.html', type='text/ng-template')
.modal-content(style='min-width:28em') .modal-content(style='min-width:28em')
.modal-body.text-center .modal-body.text-center
@@ -115,7 +114,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template')
!=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' ' !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' '
a(href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink') a(href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')
br br
button.btn.btn-primary(style='margin-top:1em' ng-click='set({"flags.contributor":false}); $close()')=env.t('huzzah') button.btn.btn-primary(style='margin-top:1em' ng-click='$close()')=env.t('huzzah')
+achievementFooter +achievementFooter
//Rebirth //Rebirth