[Cantharella-commits] r186 - in trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain: campagne document/panel extraction lot molecule personne purification specimen station testBio

27 Mar 2013

Author: echatellier
Date: 2013-03-27 13:42:48 +0100 (Wed, 27 Mar 2013)
New Revision: 186

Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/186

Log:
Instanciate read/modify list document panel with model for wicket to update it.

Modified:
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java
   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/ReadListDocumentsPanel.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java
===================================================================

--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -263,7 +263,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                campagneModel.getObject(), currentPage);
+                campagneModel, currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || campagneService.updateOrdeleteCampagneEnabled(campagneModel.getObject(), getSession()
                         .getUtilisateur()));

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -137,7 +137,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                campagneModel.getObject(), currentPage);
+                campagneModel, currentPage);
         add(readListDocumentsPanel);
 
         // Ajout du formulaire pour les actions

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 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -62,11 +62,12 @@
     /**
      * Constructeur.
      * @param id ID
-     * @param documentAttachable entity where documents are attached to
+     * @param documentAttachableModel entity model where documents are attached to
      * @param currentPage currentPage
      */
-    public ManageListDocumentsPanel(String id, final DocumentAttachable documentAttachable, final CallerPage currentPage) {
-        super(id);
+    public ManageListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, final CallerPage currentPage) {
+        super(id, documentAttachableModel);
+
         // edit mode enabled by default
         this.updateOrDeleteEnabled = true;
 
@@ -77,11 +78,11 @@
         documentsTable.setOutputMarkupId(true);
         formView.add(documentsTable);
 
-        final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachable, "documents");
+        final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, "documents");
 
         // Contenu tableaux provenance
         ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List",
-                documentModel) {
+                listDocumentModel) {
             @Override
             protected void populateItem(ListItem<Document> item) {
                 if (item.getIndex() % 2 == 1) {
@@ -94,7 +95,7 @@
                     @Override
                     public void onClick() {
                         ReadDocumentPage readDocumentPage = new ReadDocumentPage(documentModel.getObject(),
-                                documentAttachable, currentPage);
+                                documentAttachableModel.getObject(), currentPage);
                         readDocumentPage.setUpdateOrDeleteEnabled(updateOrDeleteEnabled);
                         setResponsePage(readDocumentPage);
                     }
@@ -112,7 +113,7 @@
                     @Override
                     protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                         Document document = documentModel.getObject();
-                        documentAttachable.removeDocument(document);
+                        documentAttachableModel.getObject().removeDocument(document);
 
                         if (target != null) {
                             target.add(documentsTable);
@@ -126,13 +127,13 @@
         newDocumentLink = new AjaxSubmitLink("NewDocument") {
             @Override
             protected void onSubmit(AjaxRequestTarget request, Form<?> form) {
-                setResponsePage(new ManageDocumentPage(currentPage, documentAttachable, false));
+                setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false));
             }
 
             // si erreur, le formulaire est également enregistré puis la redirection effectuée
             @Override
             protected void onError(AjaxRequestTarget target, Form<?> form) {
-                setResponsePage(new ManageDocumentPage(currentPage, documentAttachable, false));
+                setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel.getObject(), false));
             }
         };
         documentsTable.add(newDocumentLink);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -49,21 +49,21 @@
     /**
      * Constructeur
      * @param id ID
-     * @param documentAttachable document attachable
+     * @param documentAttachableModel document attachable model
      * @param currentPage current page
      */
-    public ReadListDocumentsPanel(String id, final DocumentAttachable documentAttachable, final CallerPage currentPage) {
-        super(id);
+    public ReadListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel, final CallerPage currentPage) {
+        super(id, documentAttachableModel);
 
         final MarkupContainer documentsTable = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.Table");
         documentsTable.setOutputMarkupId(true);
         add(documentsTable);
 
-        final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachable, "documents");
+        final IModel<List<Document>> listDocumentModel = new PropertyModel<List<Document>>(documentAttachableModel, "documents");
 
         // Contenu tableaux provenance
         ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List",
-                documentModel) {
+                listDocumentModel) {
             @Override
             protected void populateItem(ListItem<Document> item) {
                 if (item.getIndex() % 2 == 1) {
@@ -75,7 +75,7 @@
                 Link<Document> documentLink = new Link<Document>("Document.titre.List") {
                     @Override
                     public void onClick() {
-                        setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachable, currentPage));
+                        setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachableModel.getObject(), currentPage));
                     }
                 };
                 documentLink.add(new Label("Document.titre.Label.List", new PropertyModel<Document>(documentModel,
@@ -95,7 +95,7 @@
         MarkupContainer noTableDocuments = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.noTable") {
             @Override
             public boolean isVisible() {
-                return documentModel.getObject().isEmpty();
+                return listDocumentModel.getObject().isEmpty();
             }
         };
         add(noTableDocuments);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -274,7 +274,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                extractionModel.getObject(), currentPage);
+                extractionModel, currentPage);
         formView.add(manageListDocumentsPanel);
 
         // Action : create the extraction

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -187,7 +187,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                extractionModel.getObject(), currentPage);
+                extractionModel, currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -294,7 +294,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                lotModel.getObject(), currentPage);
+                lotModel, currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || lotService.updateOrdeleteLotEnabled(lotModel.getObject(), getSession().getUtilisateur()));
         formView.add(manageListDocumentsPanel);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -141,8 +141,8 @@
         });
 
         // add list document panel
-        ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", lotModel
-                .getObject(), currentPage);
+        ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", lotModel,
+                currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -162,14 +162,6 @@
                 .getString("Molecule.masseMolaire")), "molecule.masseMolaire", "molecule.masseMolaire",
                 DecimalDisplFormat.SMALL, templatePage.getLocale()));
 
-        columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(Model.of("")) {
-            @Override
-            public void onClick(IModel<MoleculeProvenanceBean> model) {
-                int idMolecule = model.getObject().getIdMolecule();
-                templatePage.setResponsePage(new ReadMoleculePage(idMolecule, callerPage));
-            }
-        });
-
         columns.add(new BooleanPropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage
                 .getString("Molecule.nouvMolecul")), "molecule.nouvMolecul", "molecule.nouvMolecul", templatePage));
 
@@ -199,6 +191,14 @@
         columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage
                 .getString("Molecule.provenance.programme")), "lot.campagne.programme", "lot.campagne.programme"));
 
+        columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(Model.of("")) {
+            @Override
+            public void onClick(IModel<MoleculeProvenanceBean> model) {
+                int idMolecule = model.getObject().getIdMolecule();
+                templatePage.setResponsePage(new ReadMoleculePage(idMolecule, callerPage));
+            }
+        });
+
         columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean, String>("images/edit.png", templatePage
                 .getString("Update"), templatePage.getString("Update")) {
             @Override

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -274,7 +274,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                moleculeModel.getObject(), currentPage);
+                moleculeModel, currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(updateOrDeleteEnabled);
         formView.add(manageListDocumentsPanel);
 

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -152,7 +152,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                moleculeModel.getObject(), currentPage);
+                moleculeModel, currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -144,7 +144,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                personneModel.getObject(), currentPage);
+                personneModel, currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || getSession().getUtilisateur().getTypeDroit() == TypeDroit.ADMINISTRATEUR);
         formView.add(manageListDocumentsPanel);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -87,7 +87,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                personneModel.getObject(), currentPage);
+                personneModel, currentPage);
         add(readListDocumentsPanel);
 
         // Action : mise à jour (redirection vers le formulaire)

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -248,7 +248,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                purificationModel.getObject(), currentPage);
+                purificationModel, currentPage);
         formView.add(manageListDocumentsPanel);
 
         // Action : create the purification

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -236,7 +236,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                purificationModel.getObject(), currentPage);
+                purificationModel, currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -282,7 +282,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                specimenModel.getObject(), currentPage);
+                specimenModel, currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || specimenService.updateOrdeleteSpecimenEnabled(specimenModel.getObject(), getSession()
                         .getUtilisateur()));

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -146,7 +146,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                specimenModel.getObject(), currentPage);
+                specimenModel, currentPage);
         add(readListDocumentsPanel);
 
         final Form<Void> formView = new Form<Void>("Form");

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -228,7 +228,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                stationModel.getObject(), currentPage);
+                stationModel, currentPage);
         manageListDocumentsPanel
                 .setUpdateOrDeleteEnabled(createMode
                         || stationService.updateOrdeleteStationEnabled(stationModel.getObject(), getSession()

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -111,7 +111,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                stationModel.getObject(), currentPage);
+                stationModel, currentPage);
         add(readListDocumentsPanel);
 
         // Ajout du formulaire pour les actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -279,7 +279,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                testBioModel.getObject(), currentPage);
+                testBioModel, currentPage);
         formView.add(manageListDocumentsPanel);
 
         // Action : create the testBio

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java	2013-03-27 11:22:40 UTC (rev 185)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java	2013-03-27 12:42:48 UTC (rev 186)
@@ -120,7 +120,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                testBioModel.getObject(), currentPage);
+                testBioModel, currentPage);
         add(readListDocumentsPanel);
 
         // Ajout du formulaire pour les actions

    

[Cantharella-commits] r186 - in trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain: campagne document/panel extraction lot molecule personne purification specimen station testBio

echatellier＠users.forge.codelutin.com