additional updates

TIK-NFL · Jul 19, 2024 · e839b84 · e839b84
1 parent 1f83397
commit e839b84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/src/main/java/propertyFiles/archive.properties b/src/main/java/propertyFiles/archive.properties
@@ -12,24 +12,6 @@ datasetfieldtype.archiveArchivedFor.watermark=
 datasetfieldtype.archiveArchivedAt.title=Archived At
 datasetfieldtype.archiveArchivedAt.description=The location where the files are archived
 datasetfieldtype.archiveArchivedAt.watermark=URL
-controlledvocabulary.archiveArchivedFor.1_year=1 year
-controlledvocabulary.archiveArchivedFor.3_years=3 years
-controlledvocabulary.archiveArchivedFor.5_years=5 years
-controlledvocabulary.archiveArchivedFor.10_years=10 years
-metadatablock.name=archive
-metadatablock.displayName=Archival Metadata
-datasetfieldtype.archiveActiveUntil.title=Active Until
-datasetfieldtype.archiveActiveUntil.description=A date (YYYY-MM-DD) up to which the data set is in the active state
-datasetfieldtype.archiveActiveUntil.watermark=YYYY-MM-DD
-datasetfieldtype.archiveArchivedFrom.title=Archived From
-datasetfieldtype.archiveArchivedFrom.description=A date (YYYY-MM-DD) from whith the data set is archived
-datasetfieldtype.archiveArchivedFrom.watermark=YYYY-MM-DD
-datasetfieldtype.archiveArchivedFor.title=Archived For
-datasetfieldtype.archiveArchivedFor.description=The period for which the record is to be archived. 
-datasetfieldtype.archiveArchivedFor.watermark=
-datasetfieldtype.archiveArchivedAt.title=Archived At
-datasetfieldtype.archiveArchivedAt.description=The location where the files are archived
-datasetfieldtype.archiveArchivedAt.watermark=URL
 datasetfieldtype.archiveReason.title=Archive Reason
 datasetfieldtype.archiveReason.description=The reason, why this dataset is archived and not published
 datasetfieldtype.archiveReason.watermark=

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -75,14 +75,13 @@
                                         <h:outputText value="#{bundle['retentionExpired']}" styleClass="label label-danger" rendered="#{dataFileServiceBean.isRetentionExpired(FilePage.fileMetadata)}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
                                         <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned and (FilePage.fileMetadata.datasetVersion.versionNote ne 'Archived Dataset')}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.archived']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned and (FilePage.fileMetadata.datasetVersion.versionNote eq 'Archived Dataset')}"/>
+                                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
                                         <h:outputText value="#{FilePage.fileMetadata.datasetVersion.externalStatusLabel}" styleClass="label label-info" rendered="#{FilePage.fileMetadata.datasetVersion.externalStatusLabel!=null  and FilePage.canPublishDataset()}"/>
                                         <h:outputText value="#{bundle['incomplete']}" styleClass="label label-danger" rendered="#{!FilePage.valid}"/>
                                         <!-- DATASET VERSION NUMBER -->
                                         <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
                                                       value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}"/>
-                                        <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview) and (FilePage.fileMetadata.datasetVersion.versionNote ne 'Archived Dataset')}"
+                                        <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
                                                       value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionState}"/>
                                     </div>
                                 </div>