Author: echatellier Date: 2013-03-27 16:07:49 +0100 (Wed, 27 Mar 2013) New Revision: 189 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/189 Log: Ajout du message "Liste en vide" en ?\195?\169dition. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 14:28:23 UTC (rev 188) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-03-27 15:07:49 UTC (rev 189) @@ -22,8 +22,6 @@ */ package nc.ird.cantharella.web.pages.domain.document; -import javax.inject.Inject; - import nc.ird.cantharella.data.exceptions.DataConstraintException; import nc.ird.cantharella.data.model.Document; import nc.ird.cantharella.data.model.utils.DocumentAttachable; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html 2013-03-27 14:28:23 UTC (rev 188) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.html 2013-03-27 15:07:49 UTC (rev 189) @@ -70,7 +70,14 @@ </tr> </tbody> <tfoot> - <td colspan="5"><a wicket:id="NewDocument" class="add"><wicket:message key="ListDocumentsPage.NewDocument" /></a></td> + <tr wicket:id="ListDocumentsPage.AttachedDocuments.noTable"> + <td colspan="5"> + <wicket:message key="List.none" /> + </td> + </tr> + <tr wicket:id="ListDocumentsPage.AttachedDocuments.NewDocument"> + <td colspan="5"><a wicket:id="NewDocument" class="add"><wicket:message key="ListDocumentsPage.NewDocument" /></a></td> + </tr> </tfoot> </table> </fieldset> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 14:28:23 UTC (rev 188) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-03-27 15:07:49 UTC (rev 189) @@ -57,7 +57,7 @@ protected boolean updateOrDeleteEnabled; /** New Document link (for disable). */ - protected AjaxSubmitLink newDocumentLink; + protected MarkupContainer newDocumentMarkup; /** * Constructeur. @@ -126,8 +126,20 @@ }; documentsTable.add(documentsListView); - newDocumentLink = new AjaxSubmitLink("NewDocument") { + // Selon la non existence d'elements dans la liste on affiche le span + MarkupContainer noTableDocuments = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.noTable") { @Override + public boolean isVisible() { + return listDocumentModel.getObject().isEmpty(); + } + }; + documentsTable.add(noTableDocuments); + + newDocumentMarkup = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.NewDocument"); + documentsTable.add(newDocumentMarkup); + + AjaxSubmitLink newDocumentLink = new AjaxSubmitLink("NewDocument") { + @Override protected void onSubmit(AjaxRequestTarget request, Form<?> form) { setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false)); } @@ -138,7 +150,7 @@ setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false)); } }; - documentsTable.add(newDocumentLink); + newDocumentMarkup.add(newDocumentLink); } /** @@ -149,6 +161,6 @@ public void setUpdateOrDeleteEnabled(boolean updateOrDeleteEnabled) { this.updateOrDeleteEnabled = updateOrDeleteEnabled; - newDocumentLink.setVisibilityAllowed(updateOrDeleteEnabled); + newDocumentMarkup.setVisibilityAllowed(updateOrDeleteEnabled); } }