Commit 6631ac5b authored by Matija Obreza's avatar Matija Obreza
Browse files

Organization blurps

parent d369b250
...@@ -20,6 +20,7 @@ import java.util.HashMap; ...@@ -20,6 +20,7 @@ import java.util.HashMap;
import org.genesys2.server.model.genesys.Accession; import org.genesys2.server.model.genesys.Accession;
import org.genesys2.server.model.impl.Organization; import org.genesys2.server.model.impl.Organization;
import org.genesys2.server.service.ContentService;
import org.genesys2.server.service.GenesysService; import org.genesys2.server.service.GenesysService;
import org.genesys2.server.service.OrganizationService; import org.genesys2.server.service.OrganizationService;
import org.genesys2.server.service.TaxonomyService; import org.genesys2.server.service.TaxonomyService;
...@@ -51,6 +52,9 @@ public class OrganizationController extends BaseController { ...@@ -51,6 +52,9 @@ public class OrganizationController extends BaseController {
@Autowired @Autowired
private TaxonomyService taxonomyService; private TaxonomyService taxonomyService;
@Autowired
private ContentService contentService;
@RequestMapping("/") @RequestMapping("/")
public String view(ModelMap model, @RequestParam(value = "page", required = false, defaultValue = "1") int page) { public String view(ModelMap model, @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
model.addAttribute("pagedData", organizationService.list(new PageRequest(page - 1, 50, new Sort("title")))); model.addAttribute("pagedData", organizationService.list(new PageRequest(page - 1, 50, new Sort("title"))));
...@@ -66,7 +70,9 @@ public class OrganizationController extends BaseController { ...@@ -66,7 +70,9 @@ public class OrganizationController extends BaseController {
} }
_logger.debug("Has: " + organization.getMembers()); _logger.debug("Has: " + organization.getMembers());
model.addAttribute("organization", organization); model.addAttribute("organization", organization);
//
model.addAttribute("blurp", contentService.getArticle(organization, "blurp", getLocale()));
// model.addAttribute("countByInstitute", genesysService.countByInstitute(faoInstitute)); // model.addAttribute("countByInstitute", genesysService.countByInstitute(faoInstitute));
// model.addAttribute("statisticsGenus", genesysService.statisticsGenusByInstitute(faoInstitute)); // model.addAttribute("statisticsGenus", genesysService.statisticsGenusByInstitute(faoInstitute));
// model.addAttribute("statisticsTaxonomy", genesysService.statisticsTaxonomyByInstitute(faoInstitute)); // model.addAttribute("statisticsTaxonomy", genesysService.statisticsTaxonomyByInstitute(faoInstitute));
......
...@@ -12,10 +12,16 @@ ...@@ -12,10 +12,16 @@
<small><c:out value="${organization.slug}" /></small> <small><c:out value="${organization.slug}" /></small>
</h1> </h1>
<div class="free-text"> <%-- <div class="free-text">
<c:out value="${organization.description}" escapeXml="false" /> <c:out value="${organization.description}" escapeXml="false" />
</div> </div>
--%>
<c:set var="clazz" value="${organization.class.name}" />
<c:set var="entityId" value="${organization.id}" />
<%@include file="/WEB-INF/jsp/content/include/blurp.jsp" %>
<c:remove var="clazz" />
<c:remove var="entityId" />
<div class="page-header"> <div class="page-header">
<a href="<c:url value="/org/${organization.slug}/data" />"><spring:message code="view.accessions" /></a> <a href="<c:url value="/org/${organization.slug}/data" />"><spring:message code="view.accessions" /></a>
</div> </div>
......
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