Skip to content

GitLab

Commit bc1517d2 authored by Matija Obreza's avatar Matija Obreza
Browse files

List all articles for admin/contentmanager roles

parent 08181062
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 8 deletions
src/main/java/org/genesys2/server/servlet/controller/ArticleController.java
View file @ bc1517d2
......@@ -20,6 +20,8 @@ import org.genesys2.server.model.impl.Article;
import org.genesys2.server.service.ContentService;
import org.genesys2.spring.ResourceNotFoundException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
......@@ -35,6 +37,13 @@ public class ArticleController extends BaseController {
@Autowired
private ContentService contentService;
@RequestMapping
@PreAuthorize("hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')")
public String list(ModelMap model, @RequestParam(value = "page", defaultValue = "1") int page) {
model.addAttribute("pagedData", contentService.listArticles(new PageRequest(page - 1, 50, new Sort("slug"))));
return "/content/index";
}
@RequestMapping("{url:.+}")
public String view(ModelMap model, @PathVariable(value = "url") String slug) {
_logger.debug("Viewing article " + slug);
......
src/main/resources/content/language.properties
View file @ bc1517d2
......@@ -469,3 +469,8 @@ stats.number-of-institutes={0} Institutes
stats.number-of-accessions={0} Accessions
navigate.back=Back
content.page.list.title=Article list
article.lang=Language
article.classPk=Object
src/main/resources/spring/spring.properties
View file @ bc1517d2
......@@ -44,9 +44,9 @@ captcha.publicKey=6Lf7oucSAAAAAGaS7ObroY2bNgCqMTmpyFVu7wMW
download.files.dir=./data/
# ITPGRFA Easy-SMTA account (if you have one)
itpgrfa.easysmta.url=
itpgrfa.easysmta.username=
itpgrfa.easysmta.password=
itpgrfa.easysmta.url=https://mls.planttreaty.org/itt/index.php?r=extsys/userinfo
itpgrfa.easysmta.username=genesys
itpgrfa.easysmta.password=t3st4r0ss4
# GA Account
google.analytics.account=
......
src/main/webapp/WEB-INF/jsp/content/index.jsp 0 → 100644
View file @ bc1517d2
<!DOCTYPE html>
<%@include file="/WEB-INF/jsp/init.jsp"%>
<html>
<head>
<title><spring:message code="content.page.list.title" /></title>
</head>
<body>
<h1>
<spring:message code="content.page.list.title" />
</h1>
<div class="main-col-header clearfix">
<div class="nav-header pull-left">
<div class="results"><spring:message code="paged.totalElements" arguments="${pagedData.totalElements}" /></div>
<div class="pagination">
<spring:message code="paged.pageOfPages" arguments="${pagedData.number+1},${pagedData.totalPages}" />
<a class="${pagedData.number eq 0 ? 'disabled' :''}" href="?page=${pagedData.number eq 0 ? 1 : pagedData.number}"><spring:message code="pagination.previous-page" /></a> <a href="?page=${pagedData.number + 2}"><spring:message code="pagination.next-page" /></a>
</div>
</div>
</div>
<table class="">
<thead>
<tr>
<td><spring:message code="article.slug" /></td>
<td><spring:message code="article.lang" /></td>
<td><spring:message code="article.classPk" /></td>
<td><spring:message code="article.title" /></td>
</tr>
</thead>
<tbody>
<c:forEach items="${pagedData.content}" var="article" varStatus="status">
<tr class="${status.count % 2 == 0 ? 'even' : 'odd'}">
<td><a href="<c:url value="/content/${article.slug}/edit" />">${article.slug}</a></td>
<td>${article.lang}</td>
<td>${article.classPk.className} ${article.targetId}</td>
<td>${article.title}</td>
</tr>
</c:forEach>
</tbody>
</table>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/user/index.jsp
View file @ bc1517d2
......@@ -11,12 +11,16 @@
<spring:message code="user.page.list.title" />
</h1>
<div class="nav-header">
<spring:message code="paged.totalElements" arguments="${pagedData.totalElements}" />
<br />
<spring:message code="paged.pageOfPages" arguments="${pagedData.number+1},${pagedData.totalPages}" />
<a class="${pagedData.number eq 0 ? 'disabled' :''}" href="?page=${pagedData.number eq 0 ? 1 : pagedData.number}"><spring:message code="pagination.previous-page" /></a> <a href="?page=${pagedData.number + 2}"><spring:message code="pagination.next-page" /></a>
<div class="main-col-header clearfix">
<div class="nav-header pull-left">
<div class="results"><spring:message code="paged.totalElements" arguments="${pagedData.totalElements}" /></div>
<div class="pagination">
<spring:message code="paged.pageOfPages" arguments="${pagedData.number+1},${pagedData.totalPages}" />
<a class="${pagedData.number eq 0 ? 'disabled' :''}" href="?page=${pagedData.number eq 0 ? 1 : pagedData.number}"><spring:message code="pagination.previous-page" /></a> <a href="?page=${pagedData.number + 2}"><spring:message code="pagination.next-page" /></a>
</div>
</div>
</div>
<table class="funny-list">
<c:forEach items="${pagedData.content}" var="user" varStatus="status">
<tr class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment