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

Merged
VladimirZarayskiy merged 44 commits from 68-ping-conf into dev 2019-04-25 14:00:36 +04:00
3 changed files with 9 additions and 15 deletions
Showing only changes of commit 7eb5dce94e - Show all commits

View File

@ -68,15 +68,7 @@ public class ConferenceController {
} }
@PostMapping(value = "/conferences", params = "deleteConference") @PostMapping(value = "/conferences", params = "deleteConference")
public String delete(@Valid ConferenceFilterDto conferenceFilterDto, public String delete(@RequestParam("deleteConference") Integer conferenceId) throws IOException {
@RequestParam("deleteConference") Integer conferenceId,
Errors errors,
ModelMap modelMap) throws IOException {
if (true) {
errors.reject("relationExist", "Статья прикреплена к конференции");
filterConferences(conferenceFilterDto, modelMap);
return CONFERENCES_PAGE;
}
conferenceService.delete(conferenceId); conferenceService.delete(conferenceId);
return String.format(REDIRECT_TO, CONFERENCES_PAGE); return String.format(REDIRECT_TO, CONFERENCES_PAGE);
} }

View File

@ -19,6 +19,12 @@ body {
text-decoration: none; text-decoration: none;
} }
.conference-row .d-flex .text-decoration:nth-child(1) {
margin-left: 10px;
}
.conference-row .d-flex { .conference-row .d-flex {
margin: 0 15px; margin: 0 15px;
} }
@ -121,14 +127,14 @@ body {
} }
.icon-delete { .icon-delete {
background-color: #f44; background-color: #ff7272;
background-image: url(/img/conference/delete.png); background-image: url(/img/conference/delete.png);
background-repeat: round; background-repeat: round;
color: transparent !important; color: transparent !important;
} }
.icon-delete:hover { .icon-delete:hover {
background-color: #ff2929; background-color: #ff0000;
transition: background-color .15s ease-in-out; transition: background-color .15s ease-in-out;
} }

View File

@ -20,13 +20,9 @@
</div> </div>
</div> </div>
<hr/> <hr/>
<div class="alert alert-danger" th:if="${#fields.hasErrors('*')}"> <div class="alert alert-danger" th:if="${#fields.hasErrors('*')}">
<p th:each="err : ${#fields.errors('*')}" th:text="${err}"></p> <p th:each="err : ${#fields.errors('*')}" th:text="${err}"></p>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-9 col-sm-12"> <div class="col-md-9 col-sm-12">
<th:block th:each="conference : *{conferences}"> <th:block th:each="conference : *{conferences}">