diff --git a/src/main/java/ru/ulstu/fc/rule/controller/VariableController.java b/src/main/java/ru/ulstu/fc/rule/controller/VariableController.java index b475ab3..565dbff 100644 --- a/src/main/java/ru/ulstu/fc/rule/controller/VariableController.java +++ b/src/main/java/ru/ulstu/fc/rule/controller/VariableController.java @@ -25,7 +25,7 @@ public class VariableController { public String edit(@PathVariable(value = "projectId") Integer projectId, @PathVariable(value = "varId") Integer id, Model model) { model.addAttribute("projectId", projectId); - model.addAttribute("variableForm", + model.addAttribute("variableForm", (id != null && id != 0) ? new VariableForm(id, variableService.getById(id)) : new VariableForm(id, projectId)); diff --git a/src/main/java/ru/ulstu/fc/rule/model/Variable.java b/src/main/java/ru/ulstu/fc/rule/model/Variable.java index c8d1f5f..9343d64 100644 --- a/src/main/java/ru/ulstu/fc/rule/model/Variable.java +++ b/src/main/java/ru/ulstu/fc/rule/model/Variable.java @@ -23,7 +23,7 @@ public class Variable extends BaseEntity { @NotNull private Project project; - private boolean isInput = true; + private boolean input = true; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @JoinColumn(name = "variable_id", unique = true) @@ -66,10 +66,10 @@ public class Variable extends BaseEntity { } public boolean isInput() { - return isInput; + return input; } - public void setInput(boolean isInput) { - this.isInput = isInput; + public void setInput(boolean input) { + this.input = input; } } diff --git a/src/main/java/ru/ulstu/fc/rule/model/VariableForm.java b/src/main/java/ru/ulstu/fc/rule/model/VariableForm.java index 286c86e..752c75c 100644 --- a/src/main/java/ru/ulstu/fc/rule/model/VariableForm.java +++ b/src/main/java/ru/ulstu/fc/rule/model/VariableForm.java @@ -10,7 +10,7 @@ public class VariableForm { @Size(min = 3, max = 250, message = "Длина должна быть от 3 до 250") private String name; - private boolean isInput = true; + private boolean input = true; public VariableForm() { } @@ -24,7 +24,7 @@ public class VariableForm { this.id = id; this.projectId = variable.getProject().getId(); this.name = variable.getName(); - this.isInput = variable.isInput(); + this.input = variable.isInput(); } public Integer getProjectId() { @@ -52,10 +52,10 @@ public class VariableForm { } public boolean isInput() { - return isInput; + return input; } - public void setInput(boolean isInput) { - this.isInput = isInput; + public void setInput(boolean input) { + this.input = input; } } diff --git a/src/main/java/ru/ulstu/fc/rule/service/VariableService.java b/src/main/java/ru/ulstu/fc/rule/service/VariableService.java index 88af77d..322d5c7 100644 --- a/src/main/java/ru/ulstu/fc/rule/service/VariableService.java +++ b/src/main/java/ru/ulstu/fc/rule/service/VariableService.java @@ -32,6 +32,7 @@ public class VariableService { } variable.setProject(projectService.getById(variableForm.getProjectId())); variable.setName(variableForm.getName()); + variable.setInput(variableForm.isInput()); return variableRepository.save(variable); } diff --git a/src/main/resources/templates/project/edit.html b/src/main/resources/templates/project/edit.html index 1a23237..6a4d116 100644 --- a/src/main/resources/templates/project/edit.html +++ b/src/main/resources/templates/project/edit.html @@ -31,22 +31,26 @@