romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

WIP: страницы для правил #62

Closed
Ghost wants to merge 132 commits from master into 61-rules-pages
pull from: master
merge into: romanov73:61-rules-pages
Conversation 0 Commits 132 Files Changed 146 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 591f183e8b - Show all commits

2
src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
View File

@ -11,7 +11,7 @@ public class AddRuleForm {
public AddRuleForm() { public AddRuleForm() {
} }
public AddRuleForm(Rule rule) { public AddRuleForm(DbRule rule) {
this.ruleId = rule.getId(); this.ruleId = rule.getId();
this.firstAntecedentId = rule.getFirstAntecedent().name(); this.firstAntecedentId = rule.getFirstAntecedent().name();
this.secondAntecedentId = rule.getSecondAntecedent().name(); this.secondAntecedentId = rule.getSecondAntecedent().name();

2
src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
View File

@ -45,7 +45,7 @@ public class RuleService {
} }
} }
public Rule findById(Integer id) { public DbRule findById(Integer id) {
return ruleRepository.getOne(id); return ruleRepository.getOne(id);
} }