Skip to content

Commit d573c69

Browse files
committed
Merge branch 'v3.0' into v4.0
2 parents e5c78c9 + 49d4354 commit d573c69

File tree

5 files changed

+5
-60
lines changed

5 files changed

+5
-60
lines changed

api/ToDoHandlerEFCore.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ public async Task<IActionResult> Patch(
168168
var targetTodo = this._todoContext.Todos.Where(t => t.Owner == cp.UserId).FirstOrDefault(t => t.Id == id);
169169
if (targetTodo == null)
170170
return new NotFoundResult();
171-
172-
//targetTodo.Id = newTodo.Id;
173-
targetTodo.Title = newTodo.Title;
171+
172+
targetTodo.Title = newTodo.Title ?? targetTodo.Title;
174173
targetTodo.Completed = newTodo.Completed;
175174

176175
await this._todoContext.SaveChangesAsync();

cleanup.v1.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

cleanup.v2.sh

Lines changed: 0 additions & 27 deletions
This file was deleted.

cleanup.v3.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
echo "Preparing sample for v2.0..."
4+
echo "Preparing sample for v3.0..."
55

66
# cleanup API binaries
7-
echo "Cleaning ./api ..."
87
rm -rf ./api/bin
98
rm -rf ./api/obj
109

1110
# cleanup CLIENT
12-
echo "Cleaning ./client ..."
1311
rm -rf ./client/node_modules
1412
rm -rf ./client/dist
13+
rm -rf ./client/src
1514

1615
# cleanup DATABASE
17-
echo "Cleaning ./database ..."
1816
rm -rf ./database/declarative-deploy
1917
rm -rf ./database/imperative-deploy
2018
rm -rf ./database/deploy/bin
2119
rm -rf ./database/deploy/obj
2220

2321
# cleanup TEST
24-
echo "Cleaning ./test ..."
2522
rm -rf ./test
2623

2724
echo "Done"

client/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ <h1>todos</h1>
6565

6666
<script src="https://unpkg.com/vue@2.6.14"></script>
6767
<script>
68-
API = "api/todo/";
68+
API = "api/ef/todo/";
6969
HEADERS = { 'Accept': 'application/json', 'Content-Type': 'application/json' };
7070

7171
// visibility filters

0 commit comments

Comments
 (0)