bugfix parent to parentId

This commit is contained in:
2016-01-29 10:00:13 +08:00
parent 57fb0a73af
commit 34695ac9ce
5 changed files with 13 additions and 9 deletions
-1
View File
@@ -9,7 +9,6 @@ Backbone
var TaskModel = Backbone.Model.extend({
defaults: {
parent: 0,
parentId: 0,
content: '',
isCompleted: 0
+2 -2
View File
@@ -37,10 +37,10 @@ TaskView
model: task
});
var a = taskView.render();
if (a.model.get('parent')===null||a.model.get('parent')===0)
if (a.model.get('parentId')===0)
this.$el.append(a.el);
else
a.$el.insertAfter($('*[data-id="'+a.model.get('parent')+'"]').parents('li:first'));
a.$el.insertAfter($('*[data-id="'+a.model.get('parentId')+'"]').parents('li:first'));
}
});
+5 -1
View File
@@ -160,11 +160,15 @@ define(
});
},
/**
* Add a new blank note
* @param {object} inputEle Input elelement from parent item
*/
addNote: function (inputEle) {
var $inputEle = $(inputEle);
Tasks.add({
content: '',
parentId: this.model.get('parentId')
parentId: $inputEle.data('id')||0
});
$inputEle.blur();
$inputEle.closest('li').next('li').find('input').focus();
+2 -2
View File
@@ -15,11 +15,11 @@
</div>
</div>
</div>
<% if(model.isCompleted){%>
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit task-completed">
<%}else {%>
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit">
<%}%>
</div>
</div>
</div>
+4 -3
View File
@@ -44,7 +44,7 @@ app.get('/tasks', function (req, res) {
app.post('/tasks', function (req, res) {
Tasks.create({
content: req.body.content,
parent: parseInt(req.body.parent) || 0,
parentId: parseInt(req.body.parentId) || 0,
isCompleted: false
}).then(function (task) {
res.send(task);
@@ -58,10 +58,11 @@ app.get('/tasks/:id', function (req, res) {
});
app.put('/tasks/:id', function (req, res) {
console.log(req.body.isCompleted);
console.log({isCompleted: req.body.isCompleted});
Tasks.findById(req.params.id).then(function (task) {
task.content = req.body.content;
task.parent = parseInt(req.body.parent) || 0,
console.log({view: "put('/tasks/:id)", body:req.body});
task.parentId = parseInt(req.body.parentId) || 0,
task.isCompleted = req.body.isCompleted == 1;
task.save().then(function (task) {
res.send(task);