mirror of
https://github.com/Prominence/car-repair-site.git
synced 2026-07-03 03:06:47 +03:00
Small refactoring.
This commit is contained in:
@@ -46,7 +46,7 @@ public class OrderController {
|
|||||||
model.addAttribute("order", new Order());
|
model.addAttribute("order", new Order());
|
||||||
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
||||||
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
||||||
model.addAttribute("orderStatuses", new OrderStatus[] { OrderStatus.SCHEDULED, OrderStatus.DONE, OrderStatus.ACCEPTED });
|
model.addAttribute("orderStatuses", OrderStatus.values());
|
||||||
|
|
||||||
return "order/edit";
|
return "order/edit";
|
||||||
}
|
}
|
||||||
@@ -58,7 +58,7 @@ public class OrderController {
|
|||||||
model.addAttribute("order", orderOptional.get());
|
model.addAttribute("order", orderOptional.get());
|
||||||
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
||||||
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
||||||
model.addAttribute("orderStatuses", new OrderStatus[] { OrderStatus.SCHEDULED, OrderStatus.DONE, OrderStatus.ACCEPTED });
|
model.addAttribute("orderStatuses", OrderStatus.values());
|
||||||
return "order/edit";
|
return "order/edit";
|
||||||
} else {
|
} else {
|
||||||
// TODO: need to show warning
|
// TODO: need to show warning
|
||||||
@@ -72,7 +72,7 @@ public class OrderController {
|
|||||||
order.setId(id); // why should we do this?
|
order.setId(id); // why should we do this?
|
||||||
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
||||||
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
||||||
model.addAttribute("orderStatuses", new OrderStatus[] { OrderStatus.SCHEDULED, OrderStatus.DONE, OrderStatus.ACCEPTED });
|
model.addAttribute("orderStatuses", OrderStatus.values());
|
||||||
return "order/edit";
|
return "order/edit";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +85,7 @@ public class OrderController {
|
|||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
model.addAttribute("clientIdsList", clientService.getAllClientIds());
|
||||||
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
model.addAttribute("mechanicIdsList", mechanicService.getAllMechanicIds());
|
||||||
model.addAttribute("orderStatuses", new OrderStatus[] { OrderStatus.SCHEDULED, OrderStatus.DONE, OrderStatus.ACCEPTED });
|
model.addAttribute("orderStatuses", OrderStatus.values());
|
||||||
return "order/edit";
|
return "order/edit";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user