Fixes Dataset's export navigation pane.
This commit is contained in:
parent
36ce246f0b
commit
70008f3c22
|
@ -79,7 +79,7 @@ public class DatasetWizardController extends BaseController {
|
||||||
VisibilityRuleService visibilityRuleService = this.getApiContext().getUtilitiesService().getVisibilityRuleService();
|
VisibilityRuleService visibilityRuleService = this.getApiContext().getUtilitiesService().getVisibilityRuleService();
|
||||||
return this.datasetManager.getDocument(id, visibilityRuleService, contentType);
|
return this.datasetManager.getDocument(id, visibilityRuleService, contentType);
|
||||||
}
|
}
|
||||||
else if (contentType.equals("application/msword")){
|
else if (contentType.equals("application/msword")) {
|
||||||
File file = datasetManager.getWordDocument(this.environment, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService());
|
File file = datasetManager.getWordDocument(this.environment, id, this.getApiContext().getUtilitiesService().getVisibilityRuleService());
|
||||||
InputStream resource = new FileInputStream(file);
|
InputStream resource = new FileInputStream(file);
|
||||||
HttpHeaders responseHeaders = new HttpHeaders();
|
HttpHeaders responseHeaders = new HttpHeaders();
|
||||||
|
|
|
@ -235,8 +235,8 @@ public class DatasetManager {
|
||||||
eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(datasetEntity.getProfile());
|
eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(datasetEntity.getProfile());
|
||||||
datasetprofile.setStatus(dataset.getStatus());
|
datasetprofile.setStatus(dataset.getStatus());
|
||||||
if (datasetEntity.getProperties() != null) {
|
if (datasetEntity.getProperties() != null) {
|
||||||
JSONObject jobject = new JSONObject(datasetEntity.getProperties());
|
JSONObject jObject = new JSONObject(datasetEntity.getProperties());
|
||||||
Map<String, Object> properties = jobject.toMap();
|
Map<String, Object> properties = jObject.toMap();
|
||||||
datasetprofile.fromJsonObject(properties);
|
datasetprofile.fromJsonObject(properties);
|
||||||
}
|
}
|
||||||
PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
|
PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
|
||||||
|
@ -251,11 +251,11 @@ public class DatasetManager {
|
||||||
InputStream is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream();
|
InputStream is = new URL(Paths.get(fileUrl).toUri().toURL().toString()).openStream();
|
||||||
XWPFDocument document = new XWPFDocument(is);
|
XWPFDocument document = new XWPFDocument(is);
|
||||||
eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class));
|
eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class));
|
||||||
wordBuilder.addParagraphContent(datasetEntity.getLabel(), document, ParagraphStyle.TITLE, BigInteger.ZERO);
|
wordBuilder.addParagraphContent(datasetEntity.getLabel(), document, ParagraphStyle.HEADER1, BigInteger.ZERO);
|
||||||
Map<String, Object> properties = new HashMap<>();
|
Map<String, Object> properties = new HashMap<>();
|
||||||
if (datasetEntity.getProperties() != null) {
|
if (datasetEntity.getProperties() != null) {
|
||||||
JSONObject jobject = new JSONObject(datasetEntity.getProperties());
|
JSONObject jObject = new JSONObject(datasetEntity.getProperties());
|
||||||
properties = jobject.toMap();
|
properties = jObject.toMap();
|
||||||
}
|
}
|
||||||
PagedDatasetProfile pagedDatasetProfile = getPagedProfile(dataset, datasetEntity);
|
PagedDatasetProfile pagedDatasetProfile = getPagedProfile(dataset, datasetEntity);
|
||||||
visibilityRuleService.setProperties(properties);
|
visibilityRuleService.setProperties(properties);
|
||||||
|
|
Loading…
Reference in New Issue