Compare commits

..

No commits in common. "41b23570c03a9878522bdcbaa3e97f7955085ef3" and "f08e5447fdf5ff571ad8ae822626c995d6c43329" have entirely different histories.

3 changed files with 16 additions and 17 deletions

View File

@ -16,7 +16,9 @@ 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,22 +22,19 @@
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}}"> <i class="fa fa-repeat" aria-hidden="true"></i>
<i class="fa fa-repeat" aria-hidden="true"></i> </a>
</a> <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:href="@{'deleteBranch?id=' + ${branch.id} + '&repositoryId='+${repository.id}}"
th:if="${branch.indexingStatus.name() != 'INDEXING'}" onclick="return confirm('Удалить ветку?')">
th:href="@{'deleteBranch?id=' + ${branch.id} + '&repositoryId='+${repository.id}}" <i class="fa fa-times" aria-hidden="true"></i>
onclick="return confirm('Удалить ветку?')"> </a>
<i class="fa fa-times" aria-hidden="true"></i>
</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 pull-right" th:href="@{'deleteRepository?id=' + ${repo.id}}" <a role="button" class="btn btn-danger" 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>