Skip to content

GitLab

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

Upgrade to file-repository:1.1-SNAPSHOT 

- Folders support
- Spring Security: Anons have ROLE_EVERYONE
- ACL editor updated
- Admin file repository controller updated
parent 5db86ed8
Hide whitespace changes
Inline Side-by-side
Showing with 613 additions and 305 deletions
pom.xml
View file @ 39629551
......@@ -58,7 +58,7 @@
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
<junit.version>4.12</junit.version>
<application.blocks.version>1.4</application.blocks.version>
<application.blocks.version>1.5-SNAPSHOT</application.blocks.version>
<commons.beanutils.version>1.9.2</commons.beanutils.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.io.version>2.4</commons.io.version>
......@@ -494,7 +494,7 @@
<dependency>
<groupId>org.genesys-pgr</groupId>
<artifactId>file-repository-ftpserver</artifactId>
<version>1.0</version>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
......
src/main/java/org/genesys/catalog/api/v0/RepositoryController.java deleted 100644 → 0
View file @ 5db86ed8
/*
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.genesys.catalog.api.v0;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.genesys.blocks.security.service.CustomAclService;
import org.genesys.catalog.exceptions.InvalidApiUsageException;
import org.genesys.catalog.exceptions.NotFoundElement;
import org.genesys.filerepository.InvalidRepositoryFileDataException;
import org.genesys.filerepository.InvalidRepositoryPathException;
import org.genesys.filerepository.NoSuchRepositoryFileException;
import org.genesys.filerepository.model.RepositoryFile;
import org.genesys.filerepository.service.RepositoryService;
import org.genesys2.server.api.ApiBaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.UUID;
/**
* The Class RepositoryController.
*
* @author Matija Obreza
*/
@RestController("repositoryApi0")
@RequestMapping(RepositoryController.CONTROLLER_URL)
@PreAuthorize("isAuthenticated()")
@Api(tags = { "repository" })
public class RepositoryController {
/** The Constant API_BASE. */
protected static final String CONTROLLER_URL = ApiBaseController.APIv0_BASE + "/repository";
private static final Logger LOG = LoggerFactory.getLogger(RepositoryController.class);
private final ObjectMapper objectMapper = new ObjectMapper();
/** The repository service. */
@Autowired
protected RepositoryService repositoryService;
@Autowired
private CustomAclService aclService;
/**
* Adds the file.
*
* @param inputFile the input file
* @param metadataJson the metadata json
* @return the repository file
* @throws NotFoundElement the not found element
* @throws InvalidRepositoryFileDataException the invalid repository file data
* exception
* @throws InvalidRepositoryPathException the invalid repository path exception
* @throws IOException Signals that an I/O exception has occurred.
*/
@PostMapping(value = "/add")
@Transactional
public RepositoryFile addFile(@RequestParam("file") final MultipartFile inputFile, @RequestParam("metadata") final String metadataJson) throws NotFoundElement,
InvalidRepositoryFileDataException, InvalidRepositoryPathException, IOException {
final RepositoryFile metadata = objectMapper.readValue(metadataJson, RepositoryFile.class);
final String fileName = StringUtils.defaultString(metadata.getOriginalFilename(), inputFile.getOriginalFilename());
LOG.info("Uploading {} to repository", fileName);
final RepositoryFile repositoryFile = repositoryService.addFile(metadata.getPath(), fileName, inputFile.getContentType(), inputFile.getBytes(), metadata);
// Automatically public if in /content/ folder
if (metadata.getPath().startsWith("/content/")) {
aclService.makePubliclyReadable(repositoryFile, true);
}
return repositoryFile;
}
/**
* Gets the file.
*
* @param fileUuid the file uuid
* @return the file
* @throws NoSuchRepositoryFileException the no such repository file exception
* @throws IOException Signals that an I/O exception has occurred.
*/
@GetMapping(value = "/{fileUuid}")
public RepositoryFile getFile(@PathVariable("fileUuid") final UUID fileUuid) throws NoSuchRepositoryFileException, IOException {
return repositoryService.getFile(fileUuid);
}
/**
* Update file.
*
* @param fileUuid the file uuid
* @param version the version
* @param metadata the metadata
* @return the repository file
* @throws NoSuchRepositoryFileException the no such repository file exception
* @throws IOException Signals that an I/O exception has occurred.
*/
@PostMapping(value = "/{fileUuid},{version}")
public RepositoryFile updateFile(@PathVariable("fileUuid") final UUID fileUuid, @PathVariable("version") final int version, final RepositoryFile metadata)
throws NoSuchRepositoryFileException, IOException {
if (metadata != null && metadata.getUuid().equals(fileUuid) && metadata.getVersion().equals(version)) {
return repositoryService.updateMetadata(repositoryService.getFile(fileUuid, version));
} else {
throw new InvalidApiUsageException("File uuid and version don't match");
}
}
/**
* Removes the file.
*
* @param fileUuid the file uuid
* @return the repository file
* @throws NoSuchRepositoryFileException the no such repository file exception
* @throws IOException Signals that an I/O exception has occurred.
*/
@DeleteMapping(value = "/{fileUuid}")
public RepositoryFile removeFile(@PathVariable("fileUuid") final UUID fileUuid) throws NoSuchRepositoryFileException, IOException {
return repositoryService.removeFile(repositoryService.getFile(fileUuid));
}
/**
* Download file.
*
* @param fileUuid the file uuid
* @param response the response
* @throws NoSuchRepositoryFileException the no such repository file exception
* @throws IOException Signals that an I/O exception has occurred.
*/
@GetMapping(value = "/download/{fileUuid}")
public void downloadFile(@PathVariable("fileUuid") final UUID fileUuid, final HttpServletResponse response) throws NoSuchRepositoryFileException, IOException {
final RepositoryFile repositoryFile = repositoryService.getFile(fileUuid);
response.setHeader(HttpHeaders.CACHE_CONTROL, "max-age=86400, s-maxage=86400, public, no-transform");
response.setHeader(HttpHeaders.PRAGMA, "");
response.setDateHeader(HttpHeaders.LAST_MODIFIED, repositoryFile.getLastModifiedDate().getTime());
response.setContentType(repositoryFile.getContentType());
response.addHeader("Content-Disposition", String.format("attachment; filename=\"%s\"", repositoryFile.getOriginalFilename()));
final byte[] data = repositoryService.getFileBytes(repositoryFile);
if (data != null) {
response.setContentLength(data.length);
response.getOutputStream().write(data);
}
response.flushBuffer();
}
}
src/main/java/org/genesys/catalog/service/impl/DatasetServiceImpl.java
View file @ 39629551
......@@ -343,7 +343,7 @@ public class DatasetServiceImpl implements DatasetService {
InvalidRepositoryFileDataException {
dataset = datasetRepository.findByUuidAndVersion(dataset.getUuid(), dataset.getVersion());
final RepositoryFile repositoryFile = repositoryService.addFile(Paths.get(datasetRepositoryPath, dataset.getUuid().toString()).toAbsolutePath().toString(), file
final RepositoryFile repositoryFile = repositoryService.addFile(Paths.get(datasetRepositoryPath, dataset.getUuid().toString()).toAbsolutePath(), file
.getOriginalFilename(), file.getContentType(), file.getBytes(), null);
dataset.getRepositoryFiles().add(repositoryFile);
return lazyLoad(datasetRepository.save(dataset));
......
src/main/java/org/genesys2/server/aspect/GenesysImageGalleryAspects.java
View file @ 39629551
/*
* Copyright 2017 Global Crop Diversity Trust
* Copyright 2018 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -12,7 +12,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
*/
package org.genesys2.server.aspect;
......@@ -36,31 +36,50 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
// TODO: Auto-generated Javadoc
/**
* The Class GenesysImageGalleryAspects.
*/
@Aspect
public class GenesysImageGalleryAspects extends AbstractImageGalleryAspects implements InitializingBean {
/** The Constant LOG. */
public static final Logger LOG = LoggerFactory.getLogger(GenesysImageGalleryAspects.class);
/** The Constant ACCESSION_IMAGE_PATTERN. */
private static final Pattern ACCESSION_IMAGE_PATTERN = Pattern.compile(InstituteFilesService.REPOSITORY_INSTITUTE_PREFIX + "([A-Z]{3}\\d+)"
+ InstituteFilesService.REPOSITORY_INSTITUTE_ACCESSIONFILES + "/(.+)");
/** The image gallery aspect. */
private ImageGalleryAspectsImpl imageGalleryAspect = new ImageGalleryAspectsImpl();
/** The institute files service. */
@Autowired
private InstituteFilesService instituteFilesService;
/** The image gallery service. */
@Autowired
private ImageGalleryService imageGalleryService;
/**
* Instantiates a new genesys image gallery aspects.
*/
public GenesysImageGalleryAspects() {
LOG.warn("Instantiating {}", getClass().getName());
}
/* (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
LOG.warn("Instantiating bean {}", getClass().getName());
imageGalleryAspect.setImageGalleryService(imageGalleryService);
}
/* (non-Javadoc)
* @see org.genesys.filerepository.service.aspect.AbstractImageGalleryAspects#afterRepositoryImageSaveIterable(org.aspectj.lang.JoinPoint, java.lang.Iterable)
*/
@Override
public Object afterRepositoryImageSaveIterable(JoinPoint joinPoint, Iterable<RepositoryImage> repositoryImages) throws Throwable {
if (repositoryImages != null) {
......@@ -72,6 +91,9 @@ public class GenesysImageGalleryAspects extends AbstractImageGalleryAspects impl
return super.afterRepositoryImageSaveIterable(joinPoint, repositoryImages);
}
/* (non-Javadoc)
* @see org.genesys.filerepository.service.aspect.AbstractImageGalleryAspects#afterRepositoryImageSave(org.aspectj.lang.JoinPoint, org.genesys.filerepository.model.RepositoryImage)
*/
@Override
@AfterReturning(value = "execution(* org.genesys.filerepository.persistence.RepositoryImagePersistence.save(*))", returning = "repositoryImage")
public Object afterRepositoryImageSave(JoinPoint joinPoint, RepositoryImage repositoryImage) throws Throwable {
......@@ -79,6 +101,9 @@ public class GenesysImageGalleryAspects extends AbstractImageGalleryAspects impl
return super.afterRepositoryImageSave(joinPoint, repositoryImage);
}
/* (non-Javadoc)
* @see org.genesys.filerepository.service.aspect.AbstractImageGalleryAspects#aroundRepositoryImageDelete(org.aspectj.lang.ProceedingJoinPoint, org.genesys.filerepository.model.RepositoryImage)
*/
@Override
@Around(value = "execution(* org.genesys.filerepository.persistence.RepositoryImagePersistence.delete(*)) && args(repositoryImage)")
public Object aroundRepositoryImageDelete(ProceedingJoinPoint joinPoint, RepositoryImage repositoryImage) throws Throwable {
......@@ -86,28 +111,34 @@ public class GenesysImageGalleryAspects extends AbstractImageGalleryAspects impl
}
/**
* Ensures that an {@link ImageGallery} exists for accession images
*
* @param repositoryImage
* Ensures that an {@link ImageGallery} exists for accession images.
*
* @param repositoryImage the repository image
*/
private void ensureImageGallery(RepositoryImage repositoryImage) {
LOG.trace(repositoryImage.getPath());
Matcher matcher = ACCESSION_IMAGE_PATTERN.matcher(repositoryImage.getPath());
LOG.trace(repositoryImage.getOriginalFilename());
Matcher matcher = ACCESSION_IMAGE_PATTERN.matcher(repositoryImage.getFolder().getPath());
if (matcher.matches()) {
LOG.debug("Path {} is within institute accession images prefix instCode={} acceNumb={}", repositoryImage.getPath(), matcher.group(1), matcher.group(2));
LOG.debug("Path {} is within institute accession images prefix instCode={} acceNumb={}", repositoryImage.getFolder().getPath(), matcher.group(1), matcher.group(2));
try {
instituteFilesService.createImageGallery(matcher.group(1), matcher.group(2));
} catch (InvalidRepositoryPathException e) {
LOG.warn("Error creating accession image gallery at {}, error is {}", repositoryImage.getPath(), e.getMessage());
LOG.warn("Error creating accession image gallery at {}, error is {}", repositoryImage.getFolder().getPath(), e.getMessage());
}
}
}
/* (non-Javadoc)
* @see org.genesys.filerepository.service.aspect.AbstractImageGalleryAspects#addImageToGallery(org.genesys.filerepository.model.RepositoryImage)
*/
@Override
protected void addImageToGallery(RepositoryImage repositoryImage) {
imageGalleryAspect.addImageToGallery(repositoryImage);
}
/* (non-Javadoc)
* @see org.genesys.filerepository.service.aspect.AbstractImageGalleryAspects#removeImageFromGallery(org.genesys.filerepository.model.RepositoryImage)
*/
@Override
protected void removeImageFromGallery(RepositoryImage repositoryImage) {
imageGalleryAspect.removeImageFromGallery(repositoryImage);
......
src/main/java/org/genesys2/server/mvc/RepositoryDownloadController.java
View file @ 39629551
......@@ -17,17 +17,19 @@
package org.genesys2.server.mvc;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.genesys.filerepository.NoSuchRepositoryFileException;
import org.genesys.filerepository.model.RepositoryFile;
import org.genesys.filerepository.service.BytesStorageService;
import org.genesys.filerepository.service.ImageGalleryService;
import org.genesys.filerepository.service.RepositoryService;
import org.genesys2.spring.ResourceNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -59,7 +61,7 @@ public class RepositoryDownloadController extends BaseController {
LOG.debug("_thumb path={} filename={}", path, filename);
}
data = this.byteStorageService.get(path, filename);
data = this.byteStorageService.get(Paths.get(path, filename));
response.setContentType("image/png");
} else {
......@@ -67,9 +69,9 @@ public class RepositoryDownloadController extends BaseController {
try {
final RepositoryFile repositoryFile = this.repositoryService.getFile(UUID.fromString(uuid));
sanityCheck(path, ext, repositoryFile);
sanityCheck(Paths.get(path), ext, repositoryFile);
data = this.repositoryService.getFileBytes(repositoryFile.getStoragePath(), repositoryFile.getFilename());
data = this.repositoryService.getFileBytes(repositoryFile.storagePath());
response.setHeader(HttpHeaders.CACHE_CONTROL, "max-age=86400, s-maxage=86400, public, no-transform");
response.setHeader(HttpHeaders.PRAGMA, "");
......@@ -93,7 +95,7 @@ public class RepositoryDownloadController extends BaseController {
response.flushBuffer();
}
private void sanityCheck(final String path, final String ext, final RepositoryFile repositoryFile) {
private void sanityCheck(final Path path, final String ext, final RepositoryFile repositoryFile) {
if (repositoryFile == null) {
throw new ResourceNotFoundException("No such thing");
}
......@@ -153,7 +155,7 @@ public class RepositoryDownloadController extends BaseController {
final RepositoryFile repositoryFile = this.repositoryService.getFile(UUID.fromString(uuid));
sanityCheck(path, ext, repositoryFile);
sanityCheck(Paths.get(path), ext, repositoryFile);
return repositoryFile;
}
......
src/main/java/org/genesys2/server/mvc/WiewsController.java
View file @ 39629551
......@@ -21,6 +21,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
......@@ -38,6 +40,7 @@ import org.genesys.filerepository.InvalidRepositoryPathException;
import org.genesys.filerepository.NoSuchRepositoryFileException;
import org.genesys.filerepository.model.ImageGallery;
import org.genesys.filerepository.model.RepositoryFile;
import org.genesys.filerepository.model.RepositoryFolder;
import org.genesys.filerepository.service.ImageGalleryService;
import org.genesys.filerepository.service.RepositoryService;
import org.genesys2.server.model.genesys.Accession;
......@@ -185,7 +188,8 @@ public class WiewsController extends BaseController {
instituteFilter.add(new AppliedFilter().setFilterName(FilterConstants.INSTCODE).addFilterValue(new FilterHandler.LiteralValueFilter(faoInstitute.getCode())));
try {
model.addAttribute("statisticsCrops", elasticService.termStatisticsAuto(Accession.class, AccessionFilter.convert(instituteFilter), 5, AppliedFiltersConverter.convertTerm(FilterConstants.CROPS)));
model.addAttribute("statisticsCrops", elasticService.termStatisticsAuto(Accession.class, AccessionFilter.convert(instituteFilter), 5, AppliedFiltersConverter
.convertTerm(FilterConstants.CROPS)));
} catch (SearchException e) {
LOG.warn(e.getMessage());
}
......@@ -202,37 +206,37 @@ public class WiewsController extends BaseController {
return "/wiews/details";
}
@GetMapping(value = "/{instCode}", produces = {MediaType.APPLICATION_JSON_VALUE})
public @ResponseBody ObjectNode statistics(@PathVariable("instCode") String instCode) throws Exception {
LOG.info("Statistics information for {}", instCode);
final FaoInstitute institute = instituteService.getInstitute(instCode);
if (institute == null) {
throw new Exception("Institute with instCode=" + instCode + " doesn't exist.");
}
final PDCIStatistics pdciStatistics = institute.getStatisticsPDCI();
final List<Object[]> updatedStats = genesysService.getLastUpdatedStatistics(institute, false);
final Long activeAccessions = institute.getAccessionCount();
final Long activeAccessionsWithDoi = genesysService.countByInstituteWithDoi(institute);
final ObjectMapper mapper = new ObjectMapper();
final ObjectNode lastUpdatedNode = mapper.createObjectNode();
for (final Object[] object : updatedStats) {
final String year = object[0] != null ? object[0].toString() : "never";
final Long updates = (Long) object[1];
lastUpdatedNode.put(year, updates);
}
final ObjectNode objectNode = mapper.createObjectNode();
objectNode.put("instCode", instCode);
objectNode.put("active", true);
objectNode.put("count", activeAccessions);
objectNode.set("lastUpdated", lastUpdatedNode);
objectNode.put("averagePdci", pdciStatistics.getAvg());
objectNode.put("withDoi", activeAccessionsWithDoi);
return objectNode;
}
@GetMapping(value = "/{instCode}", produces = { MediaType.APPLICATION_JSON_VALUE })
public @ResponseBody ObjectNode statistics(@PathVariable("instCode") String instCode) throws Exception {
LOG.info("Statistics information for {}", instCode);
final FaoInstitute institute = instituteService.getInstitute(instCode);
if (institute == null) {
throw new Exception("Institute with instCode=" + instCode + " doesn't exist.");
}
final PDCIStatistics pdciStatistics = institute.getStatisticsPDCI();
final List<Object[]> updatedStats = genesysService.getLastUpdatedStatistics(institute, false);
final Long activeAccessions = institute.getAccessionCount();
final Long activeAccessionsWithDoi = genesysService.countByInstituteWithDoi(institute);
final ObjectMapper mapper = new ObjectMapper();
final ObjectNode lastUpdatedNode = mapper.createObjectNode();
for (final Object[] object : updatedStats) {
final String year = object[0] != null ? object[0].toString() : "never";
final Long updates = (Long) object[1];
lastUpdatedNode.put(year, updates);
}
final ObjectNode objectNode = mapper.createObjectNode();
objectNode.put("instCode", instCode);
objectNode.put("active", true);
objectNode.put("count", activeAccessions);
objectNode.set("lastUpdated", lastUpdatedNode);
objectNode.put("averagePdci", pdciStatistics.getAvg());
objectNode.put("withDoi", activeAccessionsWithDoi);
return objectNode;
}
@RequestMapping(value = "/{wiewsCode}/stat-cropName", produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
......@@ -529,16 +533,16 @@ public class WiewsController extends BaseController {
path = UriUtils.decode(path, "UTF-8");
path = path.substring(path.indexOf("/files", 1) + 6);
final String repositoryPath = "/wiews/" + wiewsCode + path;
final Path repositoryPath = Paths.get("/wiews/", wiewsCode, path);
if (LOG.isDebugEnabled()) {
LOG.debug("Listing files in repo={} for path={}", repositoryPath, path);
}
List<String> subPaths = new ArrayList<>();
for (String subPath : repositoryService.listPaths(repositoryPath, new PageRequest(0, 10))) {
if (!subPath.equals(repositoryPath) && subPath.contains(repositoryPath)) {
subPaths.add(subPath.substring(repositoryPath.length()));
for (RepositoryFolder subPath : repositoryService.listPaths(repositoryPath)) {
if (!subPath.getFolderPath().equals(repositoryPath)) {
subPaths.add(repositoryPath.relativize(subPath.getFolderPath()).toString());
}
}
......@@ -556,12 +560,14 @@ public class WiewsController extends BaseController {
throws IOException {
final String mimeType = file.getContentType();
Path folderPath = Paths.get(repositoryPath);
try {
if (mimeType.startsWith("image")) {
repositoryService.addImage(repositoryPath, file.getOriginalFilename(), file.getContentType(), file.getBytes(), null);
repositoryService.addImage(folderPath, file.getOriginalFilename(), file.getContentType(), file.getBytes(), null);
} else {
repositoryService.addFile(repositoryPath, file.getOriginalFilename(), file.getContentType(), file.getBytes(), null);
repositoryService.addFile(folderPath, file.getOriginalFilename(), file.getContentType(), file.getBytes(), null);
}
} catch (InvalidRepositoryPathException e) {
LOG.error("Invalid repository path!", e);
......@@ -586,11 +592,7 @@ public class WiewsController extends BaseController {
RepositoryFile repositoryFile = repositoryService.getFile(UUID.fromString(uuid));
repositoryService.removeFile(repositoryFile);
if (repositoryFile.getPath().equals("/wiews/".concat(wiewsCode))) {
return "redirect:" + repositoryFile.getPath() + "/files";
} else {
return "redirect:" + repositoryFile.getPath().replace("/wiews/".concat(wiewsCode).concat("/"), "/wiews/".concat(wiewsCode).concat("/files/"));
}
return "redirect:" + Paths.get("/wiews/", wiewsCode, "files");
}
@GetMapping(value = "/{wiewsCode}/file/edit")
......@@ -599,10 +601,13 @@ public class WiewsController extends BaseController {
instituteService.getInstituteForEdit(wiewsCode);
RepositoryFile file = repositoryService.getFile(UUID.fromString(uuid));
String fileSubPath = file.getPath().replace("/wiews/" + wiewsCode, "");
final Path wiewsPath = Paths.get("/wiews/", wiewsCode);
Path relPath = wiewsPath.relativize(file.getFolder().getFolderPath().resolve(file.getOriginalFilename()));
model.addAttribute("file", file);
model.addAttribute("wiewsCode", wiewsCode);
model.addAttribute("fileSubPath", fileSubPath);
model.addAttribute("fileSubPath", relPath.toString());
return MANAGE_FILES_JSP_PATH + "/edit";
}
......@@ -613,9 +618,11 @@ public class WiewsController extends BaseController {
instituteService.getInstituteForEdit(wiewsCode);
RepositoryFile updatedFile = repositoryService.updateMetadata(fileData);
String fileSubPath = updatedFile.getPath().replace("/wiews/" + wiewsCode, "");
return "redirect:/wiews/" + wiewsCode + "/files" + fileSubPath;
final Path wiewsPath = Paths.get("/wiews/", wiewsCode);
Path relPath = wiewsPath.relativize(updatedFile.getFolder().getFolderPath().resolve(updatedFile.getOriginalFilename()));
return "redirect:/wiews/" + wiewsCode + "/files" + relPath.toString();
}
/* Image gallery management */
......@@ -633,7 +640,9 @@ public class WiewsController extends BaseController {
// check user permissions
instituteService.getInstituteForEdit(wiewsCode);
Page<ImageGallery> pagedData = imageGalleryService.listImageGalleries("/wiews/" + wiewsCode, new PageRequest(page - 1, 50, new Sort("path")));
final Path wiewsPath = Paths.get("/wiews/", wiewsCode);
Page<ImageGallery> pagedData = imageGalleryService.listImageGalleries(wiewsPath, new PageRequest(page - 1, 50, new Sort("path")));
model.addAttribute("pagedData", pagedData);
model.addAttribute("wiewsCode", wiewsCode);
......@@ -644,8 +653,9 @@ public class WiewsController extends BaseController {
public String viewInstituteGallery(ModelMap model, HttpServletRequest request, @PathVariable("wiewsCode") String wiewsCode, @RequestParam String galleryPath) {
// check user permissions
instituteService.getInstituteForEdit(wiewsCode);