Skip to content
This repository was archived by the owner on Mar 5, 2020. It is now read-only.

Commit 57cd7ed

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents b73716b + fdc5523 commit 57cd7ed

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/main/java/pl/simplemethod/codebin/repository/UsersRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
1717

1818
Users getFirstBySubscription(String subscription);
1919

20-
Users findByContainersIIdDocker(String id);
20+
Users findByContainersidDocker(String id);
2121
}

src/main/java/pl/simplemethod/codebin/srv/SrvRestController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,12 @@ ResponseEntity deleteContainer(@PathVariable(value = "ID") String containerId) {
268268
HttpHeaders headers = new HttpHeaders();
269269
headers.setContentType(MediaType.APPLICATION_JSON);
270270

271-
Users users = usersRepository.findByContainersIIdDocker(containerId);
271+
272+
Users users = usersRepository.findByContainersidDocker(containerId);
272273
Containers containerToDelete = containersRepository.getFirstByIdDocker(containerId);
273274
users.getContainers().remove(containerToDelete);
275+
usersRepository.save(users);
276+
274277

275278
org.json.JSONObject response = srvClient.deleteContainer(containerId);
276279
containersRepository.removeByIdDocker(containerId);

src/main/resources/public/dashboard/containercreate.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h3 class="page-title">Creation of a new container</h3>
99
<div class="card card-small mb-4">
1010
<div class="card-header border-bottom">
1111
<h6 class="m-0">Basic information</h6>
12-
12+
<span class="d-flex mb-2"><i class="material-icons mr-1">flag</i><strong class="mr-1">Status:</strong> Draft</span>
1313
</div>
1414
</div>
1515
</div>

0 commit comments

Comments
 (0)