WebSVN – eFlore/Applications.coel – Path Comparison – / – /branches/v1.1-aramon/ Rev 1488 and /branches/v1.1-aramon/ Rev 1489

Compare Revisions

This comparison shows the changes necessary to convert path

→ /branches/v1.1-aramon/ @ 1488

→ /branches/v1.1-aramon/ @ 1489

↔ Reverse comparison
Compare Path: Rev

With Path: Rev

Ignore whitespace Rev 1488 → Rev 1489

 /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationForm.java
 ,12 → 1121,17
                 return valeur;
         }
         private void setValeurComboProjets() {
-                if (projetsCombo.getStore() != null ) {
-                        if (mode.equals(Formulaire.MODE_MODIFIER) && publication != null) {
-                                projetsCombo.getCombo().setValue(projetsCombo.getStore().findModel("cpr_id_projet", publication.getIdProjet()));
-                        } else if (mode.equals(Formulaire.MODE_AJOUTER)) {
-                                projetsCombo.getCombo().setValue(projetsCombo.getStore().findModel("cpr_id_projet", mediateur.getProjetId()));
+                if (mode.equals(Formulaire.MODE_MODIFIER) && publication != null) {
+                        if (projetsCombo.getCombo().getStore() != null
+                                        && publication != null
+                                        && publication.getIdProjet() != null
+                                        && !UtilString.isEmpty(publication.getIdProjet())) {
+                                projetsCombo.chargerValeurInitiale(publication.getIdProjet(), "cpr_id_projet");
                         }
+                } else if (mode.equals(Formulaire.MODE_AJOUTER)) {
+                        projetsCombo.getCombo().setValue(projetsCombo.getStore().findModel("cpr_id_projet", mediateur.getProjetId()));
+                } else {
+                        projetsCombo.getCombo().setValue(null);
                 }
         }

Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1488 → Rev 1489