Author: glandais Date: 2008-03-13 17:14:25 +0000 (Thu, 13 Mar 2008) New Revision: 1331 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java Log: Bug https://labs.libre-entreprise.org/tracker/index.php?func=detail&aid=1624&group_id=130&atid=586 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-13 16:59:29 UTC (rev 1330) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-13 17:14:25 UTC (rev 1331) @@ -24,6 +24,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; +import fr.cemagref.simexplorer.is.entities.data.Component; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; import fr.cemagref.simexplorer.is.entities.data.ExplorationData; import fr.cemagref.simexplorer.is.entities.data.Library; @@ -74,7 +75,7 @@ DELETE("delete", ActionAvailabilty.BOTH, ExplorationApplication.class, ExplorationData.class), /** HISTORY. */ - HISTORY("history", ActionAvailabilty.WEB, LoggableElement.class), + HISTORY("history", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class, Library.class, Component.class), /** RIGHTS. */ RIGHTS("rights", ActionAvailabilty.WEB, ExplorationApplication.class, ExplorationData.class), Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-13 16:59:29 UTC (rev 1330) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-13 17:14:25 UTC (rev 1331) @@ -65,7 +65,7 @@ if (size() == 0) { return false; } - return visitEnter(visitor); + return super.visitEnter(visitor); } /* (non-Javadoc) Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-03-13 16:59:29 UTC (rev 1330) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-03-13 17:14:25 UTC (rev 1331) @@ -44,7 +44,7 @@ @Override public void setup(String uuid, String version) throws SimExplorerException { super.setup(uuid, version); - versions = RemoteStorageService.getStorageService().getVersions(getToken(), uuid); + versions = RemoteStorageService.getStorageService().getVersions(getToken(), uuid); } /* (non-Javadoc) @@ -63,8 +63,10 @@ public List<String> getHeaders() { List<String> result = new ArrayList<String>(); result.add(getMessages().get("simexplorer.ui.web.version")); + result.add(getMessages().get("simexplorer.ui.web.name")); result.add(getMessages().get("simexplorer.ui.web.description")); result.add(getMessages().get("simexplorer.ui.web.date")); + result.add(getMessages().get("simexplorer.ui.web.actions")); return result; } @@ -178,8 +180,10 @@ TreeNode node = new TreeNode(); MetaData mde = RemoteStorageService.getStorageService().getMetadata(getToken(), getMetadata().getUuid(), version.toString()); - node.setColumns(generateStringArray(mde.getVersion().toString(), mde.getDescription(), DATE_FORMAT.format(mde - .getCreationDate()), mde, false, "metadata", "export", "delete", "details")); + String[] columns = generateStringArray(generateString(mde.getVersion().toString(), + "details", mde), mde.getName(), mde.getDescription(), DATE_FORMAT + .format(mde.getCreationDate()), generateActions(mde, false, "metadata", "export", "delete", "details")); + node.setColumns(columns); node.setObject(mde.getVersion()); node.setType(TreeNode.TYPE_DOCUMENT); return node; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-13 16:59:29 UTC (rev 1330) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-03-13 17:14:25 UTC (rev 1331) @@ -234,7 +234,7 @@ * * @return the string */ - private String generateActions(MetaData element, boolean security, String... actions) { + protected String generateActions(MetaData element, boolean security, String... actions) { StringBuilder sb = new StringBuilder(""); String res;