From ed43bec8cd8b38996bb45ed1b949e6ea46055ea0 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Wed, 10 Jun 2015 08:49:26 -0500
Subject: [PATCH] Allow default tasks to not have notes

---
 common/script/content.coffee | 8 ++++----
 website/src/models/user.js   | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/script/content.coffee b/common/script/content.coffee
index cef86206aa..30a0760b87 100644
--- a/common/script/content.coffee
+++ b/common/script/content.coffee
@@ -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}
 api.userDefaults =
   habits: [
-    {type: 'habit', text: t('defaultHabit1Text'), notes: t('defaultTaskNotes'), 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('defaultHabit3Text'), notes: t('defaultTaskNotes'), value: 0, up: true, down: true, attribute: 'str'}
+    {type: 'habit', text: t('defaultHabit1Text'), value: 0, up: true, down: false, attribute: 'per' }
+    {type: 'habit', text: t('defaultHabit2Text'), value: 0, up: false, down: true, attribute: 'str'}
+    {type: 'habit', text: t('defaultHabit3Text'), value: 0, up: true, down: true, attribute: 'str'}
   ]
 
   dailys: [
@@ -1898,7 +1898,7 @@ api.userDefaults =
   ]
 
   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 }
   ]
 
diff --git a/website/src/models/user.js b/website/src/models/user.js
index b24acfd886..634bb61f07 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -406,7 +406,7 @@ var UserSchema = new Schema({
   rewards:  {type:[TaskSchemas.RewardSchema]},
 
   extra: Schema.Types.Mixed,
- 
+
   pushDevices: {type: [{
     regId: {type: String},
     type: {type: String}
@@ -459,7 +459,9 @@ UserSchema.pre('save', function(next) {
           newTask.name = newTask.name(self.preferences.language);
         }else{
           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){
             newTask.checklist = _.map(newTask.checklist, function(checklistItem){