Commit d820e4c

committed

Merge branch 'v2.0' into v3.0

2 parents a6bee84 + f6cb745 commit d820e4cCopy full SHA for d820e4c

File tree

-32

lines changed

-32

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: 0 additions & 24 deletions

This file was deleted.

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,24 +4,21 @@ set -euo pipefail`
`4`	`4`	`echo "Preparing sample for v2.0..."`
`5`	`5`
`6`	`6`	`# cleanup API binaries`
`7`		`-echo "Cleaning ./api ..."`
`8`	`7`	`rm -rf ./api/bin`
`9`	`8`	`rm -rf ./api/obj`
`10`	`9`
`11`	`10`	`# cleanup CLIENT`
`12`		`-echo "Cleaning ./client ..."`
`13`	`11`	`rm -rf ./client/node_modules`
`14`	`12`	`rm -rf ./client/dist`
	`13`	`+rm -rf ./client/src`
`15`	`14`
`16`	`15`	`# cleanup DATABASE`
`17`		`-echo "Cleaning ./database ..."`
`18`	`16`	`rm -rf ./database/declarative-deploy`
`19`	`17`	`rm -rf ./database/imperative-deploy`
`20`	`18`	`rm -rf ./database/deploy/bin`
`21`	`19`	`rm -rf ./database/deploy/obj`
`22`	`20`
`23`	`21`	`# cleanup TEST`
`24`		`-echo "Cleaning ./test ..."`
`25`	`22`	`rm -rf ./test`
`26`	`23`
`27`	`24`	`echo "Done"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ <h1>todos</h1>`
`65`	`65`
`66`	`66`	`<script src="https://unpkg.com/vue@2.6.14"></script>`
`67`	`67`	`<script>`
`68`		`- API = "api/todo/";`
	`68`	`+ API = "api/ef/todo/";`
`69`	`69`	`HEADERS = { 'Accept': 'application/json', 'Content-Type': 'application/json' };`
`70`	`70`
`71`	`71`	`// visibility filters`

Comments

(0)