From 6ac06c0692836a5de59bfa8ab47a543f60e3256f Mon Sep 17 00:00:00 2001 From: mka Date: Wed, 18 Sep 2013 07:15:20 +0000 Subject: [PATCH] Show URLs for previous versions of the document's files. --- .../Siman/WebContent/jsp/editContents.jsp | 23 +++++++++++++++---- .../Siman/WebContent/jsp/readContents.jsp | 23 +++++++++++++++---- .../WebContent/study/versionDocument.jsp | 12 +++++----- Workspace/Siman/src/labels.properties | 5 +++- Workspace/Siman/src/labels_en.properties | 5 +++- .../Siman/src/org/splat/simer/FileFacade.java | 6 ++--- ...ocumentAction-valid-version-validation.xml | 8 +++++++ Workspace/Siman/src/struts.xml | 2 ++ 8 files changed, 65 insertions(+), 19 deletions(-) create mode 100644 Workspace/Siman/src/org/splat/simer/VersionDocumentAction-valid-version-validation.xml diff --git a/Workspace/Siman/WebContent/jsp/editContents.jsp b/Workspace/Siman/WebContent/jsp/editContents.jsp index c32ca88..f443ec2 100644 --- a/Workspace/Siman/WebContent/jsp/editContents.jsp +++ b/Workspace/Siman/WebContent/jsp/editContents.jsp @@ -100,7 +100,11 @@ " border="none" title=""/> - :  + + + :  + +    @@ -112,8 +116,10 @@ " border="none" title=""/> - :  -   + + :  +   +    @@ -144,7 +150,16 @@ - + +
" border="none" title=""/> + + + + + + + +
diff --git a/Workspace/Siman/WebContent/jsp/readContents.jsp b/Workspace/Siman/WebContent/jsp/readContents.jsp index 29cca49..6286a60 100644 --- a/Workspace/Siman/WebContent/jsp/readContents.jsp +++ b/Workspace/Siman/WebContent/jsp/readContents.jsp @@ -68,7 +68,11 @@ " border="none" title=""/> - :  + + + :  + +    @@ -80,8 +84,10 @@ " border="none" title=""/> - :  -   + + :  +   +    @@ -112,7 +118,16 @@ - + +
" border="none" title=""/> + + + + + + + +
diff --git a/Workspace/Siman/WebContent/study/versionDocument.jsp b/Workspace/Siman/WebContent/study/versionDocument.jsp index d8ee105..e56bcd4 100644 --- a/Workspace/Siman/WebContent/study/versionDocument.jsp +++ b/Workspace/Siman/WebContent/study/versionDocument.jsp @@ -34,11 +34,11 @@ $(document).ready(function () { -
+ + - @@ -73,7 +73,8 @@ $(document).ready(function () { + name="description" disabled="true" size="60" + value='%{getText("default.versioning.description")}'/> @@ -107,7 +108,6 @@ $(document).ready(function () { name="documentState" list="documentStates" listKey="value" listValue="%{getText(key)}" disabled="" /> -
:
- + diff --git a/Workspace/Siman/src/labels.properties b/Workspace/Siman/src/labels.properties index 72d8d3e..c61d70b 100644 --- a/Workspace/Siman/src/labels.properties +++ b/Workspace/Siman/src/labels.properties @@ -44,6 +44,7 @@ menu.remove.study = Supprimer l'' menu.remove.document = Supprimer ce document menu.remove.version = Supprimer cette version menu.purge = Supprimer l''historique +menu.actualize = Set up-to-date menu.admin.indexing = Indexer les études menu.admin.importuser = Importer des utilisateurs @@ -311,6 +312,7 @@ message.upload = Le fichier "{0}" a message.checkedout = Ce scénario a été réservé par {0} le {1}. Pour pouvoir en modifier les propriétés, {2} doit donc préalablement restituer ses modifications.
Du coup, voulez-vous : message.checkin = Voulez-vous vraiment abandonner les modifications en cours ? message.dependencies = Les documents suivants devront a priori être mis à jour car ils utilisent le document en cours de versionnement.
Si certains d''entre eux ne sont PAS IMPACTÉS par ce versionnement, ils doivent être COCHÉS. +message.actualize.document= Do you really want to set this documents state to up-to-date ? message.info.contact = Contactez votre administrateur système. message.info.scename = Si besoin, changez le titre du scénario ci-dessous. @@ -345,4 +347,5 @@ message.error.version.mismatch = Ce document porte un num message.error.comparison = Invalid comparison input data. Select at least one document; all selected documents should have compatible format. #Validation errors -message.error.noenteredvalue=The field ''{0}'' must be filled \ No newline at end of file +message.error.noenteredvalue=The field ''{0}'' must be filled +default.versioning.description = A new Version \ No newline at end of file diff --git a/Workspace/Siman/src/labels_en.properties b/Workspace/Siman/src/labels_en.properties index bb1a0f1..c6979b0 100644 --- a/Workspace/Siman/src/labels_en.properties +++ b/Workspace/Siman/src/labels_en.properties @@ -46,6 +46,7 @@ menu.remove.version = Remove this version menu.purge = Remove the history menu.markasreference = Mark as Reference menu.removeasreference = Remove as Reference +menu.actualize = Set up-to-date menu.reject = Reject menu.admin.indexing = Index the studies @@ -312,6 +313,7 @@ message.upload = The file "{0}" has been successfully uploaded. message.checkedout = This scenario has been checked-out by {0} on {1}. For being able to edit the properties, {2} must first check-in his/her modifications.
Then, do you want : message.checkin = Do you really want to forget the on-going modifications ? message.dependencies = The documents below will must probably be updated because they use the document being versioned.
Those which are NOT IMPACTED by this versioning must be CHECKED. +message.actualize.document= Do you really want to set this documents state to up-to-date ? message.info.contact = Contact your system administrator. message.info.scename = If needed, change below the title of the scenario. @@ -346,4 +348,5 @@ message.error.version.mismatch = The revision number of this document is illi message.error.comparison = Invalid comparison input data. Select at least one document; all selected documents should have compatible format. #Validation errors -message.error.noenteredvalue=The field ''{0}'' must be filled \ No newline at end of file +message.error.noenteredvalue=The field ''{0}'' must be filled +default.versioning.description = A new Version \ No newline at end of file diff --git a/Workspace/Siman/src/org/splat/simer/FileFacade.java b/Workspace/Siman/src/org/splat/simer/FileFacade.java index 0b5b484..0c75f1f 100644 --- a/Workspace/Siman/src/org/splat/simer/FileFacade.java +++ b/Workspace/Siman/src/org/splat/simer/FileFacade.java @@ -26,8 +26,8 @@ public class FileFacade { final ApplicationSettings applicationSettings) { ResourceBundle custom = ResourceBundle.getBundle("som", applicationSettings.getCurrentLocale()); - File export = represented.getTo().asFile(); - String path = export.getPath(); + org.splat.dal.bo.som.File export = represented.getTo(); + String path = export.getRelativePath(); String[] table = path.split("\\x2E"); DecimalFormat tostring = new DecimalFormat(custom .getString("size.format")); // Locale size display format @@ -38,7 +38,7 @@ public class FileFacade { _surl = applicationSettings.getRepositoryURL() + path; _surl = _surl.replaceAll("'", "\\\\'"); _format = table[table.length - 1].toUpperCase(); - _size = tostring.format(export.length() / 1000); + _size = tostring.format(export.asFile().length() / 1000); _date = convert.format(represented.getTo().getDate()); _comment = represented.getDescription(); if (_comment == null) { diff --git a/Workspace/Siman/src/org/splat/simer/VersionDocumentAction-valid-version-validation.xml b/Workspace/Siman/src/org/splat/simer/VersionDocumentAction-valid-version-validation.xml new file mode 100644 index 0000000..50134fc --- /dev/null +++ b/Workspace/Siman/src/org/splat/simer/VersionDocumentAction-valid-version-validation.xml @@ -0,0 +1,8 @@ + + + + + ${getText("message.error.noenteredvalue", "-", getText("field.description"))} + + + \ No newline at end of file diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml index f1f7ea5..172b88f 100644 --- a/Workspace/Siman/src/struts.xml +++ b/Workspace/Siman/src/struts.xml @@ -539,6 +539,8 @@ + + step-study -- 2.39.2