Compare commits

..

2 Commits

Author SHA1 Message Date
41b23570c0 #91 -- Fix buttons 2023-02-25 12:26:48 +04:00
a701f943eb #91 -- Fix mvc config 2023-02-25 11:30:08 +04:00
3 changed files with 17 additions and 16 deletions

View File

@ -16,9 +16,7 @@ import static ru.ulstu.extractor.core.Route.LIST_INDEXED_REPOSITORIES;
public class MvcConfiguration implements WebMvcConfigurer { public class MvcConfiguration implements WebMvcConfigurer {
@Override @Override
public void addViewControllers(ViewControllerRegistry registry) { public void addViewControllers(ViewControllerRegistry registry) {
registry.addViewController("/{articlename:\\w+}");
registry.addRedirectViewController("/", LIST_INDEXED_REPOSITORIES); registry.addRedirectViewController("/", LIST_INDEXED_REPOSITORIES);
registry.addRedirectViewController("/default", "/home");
} }
@Override @Override

View File

@ -22,6 +22,7 @@
th:text="${branch.name}"></a> th:text="${branch.name}"></a>
</td> </td>
<td> <td>
<div class="pull-right">
<a role="button" class="btn btn-primary" title="Повторить индексацию ветки" <a role="button" class="btn btn-primary" title="Повторить индексацию ветки"
th:if="${branch.indexingStatus.name() != 'INDEXING'}" th:if="${branch.indexingStatus.name() != 'INDEXING'}"
th:href="@{'reindexBranch?branchId=' + ${branch.id}}"> th:href="@{'reindexBranch?branchId=' + ${branch.id}}">
@ -30,11 +31,13 @@
<a role="button" class="btn btn-dark disabled" <a role="button" class="btn btn-dark disabled"
th:if="${branch.indexingStatus.name() == 'INDEXING'}">Индексируется... th:if="${branch.indexingStatus.name() == 'INDEXING'}">Индексируется...
</a> </a>
<a role="button" class="btn btn-danger" th:if="${branch.indexingStatus.name() != 'INDEXING'}" <a role="button" class="btn btn-danger"
th:if="${branch.indexingStatus.name() != 'INDEXING'}"
th:href="@{'deleteBranch?id=' + ${branch.id} + '&repositoryId='+${repository.id}}" th:href="@{'deleteBranch?id=' + ${branch.id} + '&repositoryId='+${repository.id}}"
onclick="return confirm('Удалить ветку?')"> onclick="return confirm('Удалить ветку?')">
<i class="fa fa-times" aria-hidden="true"></i> <i class="fa fa-times" aria-hidden="true"></i>
</a> </a>
</div>
</td> </td>
</tr> </tr>
</tbody> </tbody>

View File

@ -21,7 +21,7 @@
<td><a th:href="@{${@route.LIST_REPOSITORY_BRANCHES} + '?repositoryId=' + ${repo.id}}" <td><a th:href="@{${@route.LIST_REPOSITORY_BRANCHES} + '?repositoryId=' + ${repo.id}}"
th:text="${repo.name}" th:title="${repo.url}"></a></td> th:text="${repo.name}" th:title="${repo.url}"></a></td>
<td> <td>
<a role="button" class="btn btn-danger" th:href="@{'deleteRepository?id=' + ${repo.id}}" <a role="button" class="btn btn-danger pull-right" th:href="@{'deleteRepository?id=' + ${repo.id}}"
onclick="return confirm('Удалить репозиторий?')"> onclick="return confirm('Удалить репозиторий?')">
<i class="fa fa-times" aria-hidden="true"></i> <i class="fa fa-times" aria-hidden="true"></i>
</a> </a>