Commit 96ff616

committed

Merge branch 'v5.0' into v6.0

2 parents 4604c7d + b3fc1fe commit 96ff616Copy full SHA for 96ff616

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,8 @@ public async Task<IActionResult> Patch(`
`168`	`168`	`var targetTodo = this._todoContext.Todos.Where(t => t.Owner == cp.UserId).FirstOrDefault(t => t.Id == id);`
`169`	`169`	`if (targetTodo == null)`
`170`	`170`	`return new NotFoundResult();`
`171`		`-`
`172`		`- //targetTodo.Id = newTodo.Id;`
`173`		`- targetTodo.Title = newTodo.Title;`
	`171`	`+`
	`172`	`+ targetTodo.Title = newTodo.Title ?? targetTodo.Title;`
`174`	`173`	`targetTodo.Completed = newTodo.Completed;`
`175`	`174`
`176`	`175`	`await this._todoContext.SaveChangesAsync();`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,10 @@ rm -rf ./client/dist`
`13`	`13`	`rm ./client/index.html`
`14`	`14`
`15`	`15`	`# cleanup DATABASE`
`16`		`-rm -rf ./database/deploy`
	`16`	`+rm -rf ./database/declarative-deploy`
	`17`	`+rm -rf ./database/imperative-deploy`
	`18`	`+rm -rf ./database/deploy/bin`
	`19`	`+rm -rf ./database/deploy/obj`
`17`	`20`
`18`	`21`	`# cleanup TEST`
`19`	`22`	`rm -rf ./test`

Comments

(0)