aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java2
-rw-r--r--src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java2
-rw-r--r--src/main/resources/templates/operationProducts.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java
index 6e29e09..a49cf20 100644
--- a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java
+++ b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java
@@ -91,7 +91,7 @@ public class OperationsController {
operation.setResponsible(partner.getContacts().stream().findFirst().orElseThrow());
operationDAO.save(operation);
- return "redirect:/operations";
+ return String.format("redirect:/operation?id=%d", operation.getId());
}
@RequestMapping("/operationProducts/{operationId}")
diff --git a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java
index 78a2294..dd62439 100644
--- a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java
+++ b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java
@@ -112,7 +112,7 @@ public class PartnersController {
contact = new PartnerContact(partner, surname, name, position, phone, email);
} else {
contact = partnerContactDAO.findById(id).orElseThrow();
- contact.setSurname(name);
+ contact.setSurname(surname);
contact.setName(name);
contact.setEmail(email);
contact.setPhone(phone);
diff --git a/src/main/resources/templates/operationProducts.html b/src/main/resources/templates/operationProducts.html
index f3997b4..046b738 100644
--- a/src/main/resources/templates/operationProducts.html
+++ b/src/main/resources/templates/operationProducts.html
@@ -7,7 +7,7 @@
<div class="indent">
<form method="get" th:action="'/operationProducts/' + ${operationId} + '/new/'">
- <button id="newPartnerContactBtn" type="submit" class="btn btn-primary">Добавить новый продукт</button>
+ <button id="newOperationProductBtn" type="submit" class="btn btn-primary">Добавить новый продукт</button>
</form>
<br>