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

Allow default tasks to not have notes

Browse Source
This commit is contained in:
Blade Barringer
2015-06-10 08:49:26 -05:00
parent 097e1ff70b
commit ed43bec8cd
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/script/content.coffee
View File

@@ -1877,9 +1877,9 @@ _.each api.subscriptionBlocks, (b,k)->b.key = k
repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true} repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true}
api.userDefaults = api.userDefaults =
habits: [ habits: [
{type: 'habit', text: t('defaultHabit1Text'), notes: t('defaultTaskNotes'), value: 0, up: true, down: false, attribute: 'per' } {type: 'habit', text: t('defaultHabit1Text'), value: 0, up: true, down: false, attribute: 'per' }
{type: 'habit', text: t('defaultHabit2Text'), notes: t('defaultTaskNotes'), value: 0, up: false, down: true, attribute: 'str'} {type: 'habit', text: t('defaultHabit2Text'), value: 0, up: false, down: true, attribute: 'str'}
{type: 'habit', text: t('defaultHabit3Text'), notes: t('defaultTaskNotes'), value: 0, up: true, down: true, attribute: 'str'} {type: 'habit', text: t('defaultHabit3Text'), value: 0, up: true, down: true, attribute: 'str'}
] ]
dailys: [ dailys: [
@@ -1898,7 +1898,7 @@ api.userDefaults =
] ]
rewards: [ rewards: [
{type: 'reward', text: t('defaultReward1Text'), notes: t('defaultTaskNotes'), value: 10 } {type: 'reward', text: t('defaultReward1Text'), value: 10 }
# {type: 'reward', text: t('defaultReward2Text'), notes: t('defaultReward2Notes'), value: 10 } # {type: 'reward', text: t('defaultReward2Text'), notes: t('defaultReward2Notes'), value: 10 }
] ]

6
website/src/models/user.js
View File

@@ -406,7 +406,7 @@ var UserSchema = new Schema({
rewards: {type:[TaskSchemas.RewardSchema]}, rewards: {type:[TaskSchemas.RewardSchema]},
extra: Schema.Types.Mixed, extra: Schema.Types.Mixed,
pushDevices: {type: [{ pushDevices: {type: [{
regId: {type: String}, regId: {type: String},
type: {type: String} type: {type: String}
@@ -459,7 +459,9 @@ UserSchema.pre('save', function(next) {
newTask.name = newTask.name(self.preferences.language); newTask.name = newTask.name(self.preferences.language);
}else{ }else{
newTask.text = newTask.text(self.preferences.language); newTask.text = newTask.text(self.preferences.language);
newTask.notes = newTask.notes(self.preferences.language); if(newTask.notes) {
newTask.notes = newTask.notes(self.preferences.language);
}
if(newTask.checklist){ if(newTask.checklist){
newTask.checklist = _.map(newTask.checklist, function(checklistItem){ newTask.checklist = _.map(newTask.checklist, function(checklistItem){