romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

Resolve "Ping конференции в списке конференций" #196

Merged
VladimirZarayskiy merged 44 commits from 68-ping-conf into dev 2019-04-25 14:00:36 +04:00
Conversation 13 Commits 44 Files Changed 54 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c18ecea13b - Show all commits

7
src/main/java/ru/ulstu/grant/controller/GrantController.java
View File

@ -83,12 +83,7 @@ public class GrantController {
@PostMapping(value = "/grant", params = "attachPaper") @PostMapping(value = "/grant", params = "attachPaper")
public String attachPaper(GrantDto grantDto) { public String attachPaper(GrantDto grantDto) {
if (!grantDto.getPaperIds().isEmpty()) { grantService.attachPaper(grantDto);
grantDto.getPapers().clear();
grantDto.setPapers(grantService.getGrantPapers(grantDto.getPaperIds()));
} else {
grantDto.getPapers().clear();
}
return GRANT_PAGE; return GRANT_PAGE;
} }

8
src/main/java/ru/ulstu/grant/service/GrantService.java
View File

@ -176,4 +176,12 @@ public class GrantService {
return paperService.findAll(); return paperService.findAll();
} }
public void attachPaper(GrantDto grantDto) {
if (!grantDto.getPaperIds().isEmpty()) {
grantDto.getPapers().clear();
grantDto.setPapers(getGrantPapers(grantDto.getPaperIds()));
} else {
grantDto.getPapers().clear();
}
}
} }