diff --git a/src/main/java/ru/ulstu/fc/rule/controller/RuleController.java b/src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
index 5788d53..6107baa 100644
--- a/src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
+++ b/src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import ru.ulstu.fc.rule.model.Rule;
import ru.ulstu.fc.rule.model.RuleForm;
+import ru.ulstu.fc.rule.service.RuleService;
@Controller
@RequestMapping("rule")
@@ -19,8 +20,10 @@ public class RuleController {
this.ruleService = ruleService;
}
- @GetMapping("/edit/{ruleId}")
- public String edit(@PathVariable(value = "ruleId") Integer id, Model model) {
+ @GetMapping("/edit/{projectId}/{ruleId}")
+ public String edit(@PathVariable(value = "projectId") Integer projectId,
+ @PathVariable(value = "ruleId") Integer id, Model model) {
+ model.addAttribute("projectId", projectId);
model.addAttribute("rule",
new RuleForm((id != null && id != 0)
? ruleService.getById(id)
diff --git a/src/main/java/ru/ulstu/fc/rule/controller/RuleService.java b/src/main/java/ru/ulstu/fc/rule/service/RuleService.java
similarity index 97%
rename from src/main/java/ru/ulstu/fc/rule/controller/RuleService.java
rename to src/main/java/ru/ulstu/fc/rule/service/RuleService.java
index 8e7d89a..929892a 100644
--- a/src/main/java/ru/ulstu/fc/rule/controller/RuleService.java
+++ b/src/main/java/ru/ulstu/fc/rule/service/RuleService.java
@@ -1,4 +1,4 @@
-package ru.ulstu.fc.rule.controller;
+package ru.ulstu.fc.rule.service;
import org.springframework.stereotype.Service;
diff --git a/src/main/resources/templates/project/edit.html b/src/main/resources/templates/project/edit.html
index aa796e0..ed29db0 100644
--- a/src/main/resources/templates/project/edit.html
+++ b/src/main/resources/templates/project/edit.html
@@ -68,5 +68,6 @@
И / ИЛИ
+ Добавить правило