WebSVN – eFlore/Applications.coel – Path Comparison – / – /branches/v1.8-narince/src/org/tela_botanica/client/vues/ Rev 1883 and /branches/v1.8-narince/src/org/tela

Ignore whitespace Rev 1883 → Rev 1884

/branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneForm.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneForm.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionForm.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/collection
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/collection:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/FenetreForm.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/FenetreForm.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/FormulaireOnglet.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/FormulaireOnglet.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureListeVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureListeVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureForm.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureForm.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/structure
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/structure:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/DetailVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/DetailVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/FenetreJournal.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/FenetreJournal.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/commentaire:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/MenuVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/MenuVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/BarrePaginationVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/BarrePaginationVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/accueil
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/accueil:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationVue.java:r1882

 /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java
 ,6 → 41,7
 import com.extjs.gxt.ui.client.widget.layout.FitLayout;
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.Window;
 public class PublicationListeVue extends ContentPanel implements Rafraichissable {
 ,7 → 154,11
                 importer.setIcon(Images.ICONES.importerCsv());
                 importer.addSelectionListener(new SelectionListener<ButtonEvent>() {
                         public void componentSelected(ButtonEvent be) {
-                                mediateur.clicImporterPublication(PublicationListeVue.this);
+                                if(mediateur.getUtilisateur().isIdentifie()) {
+                                        mediateur.clicImporterPublication(PublicationListeVue.this);
+                                } else {
+                                        Window.alert(i18nC.identificationNecessaire());
+                                }
                         }
                 });
                 importer.setToolTip(i18nC.indicationImporterUnePubli());
 Property changes:
 Modified: svn:mergeinfo
 Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationForm.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationForm.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/publication
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/publication:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/ContenuVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/ContenuVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/PopupChargement.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/PopupChargement.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/EnteteVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/EnteteVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/StatutVue.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/StatutVue.java:r1882

/branches/v1.8-narince/src/org/tela_botanica/client/vues/Formulaire.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/vues/Formulaire.java:r1882

Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1883 → Rev 1884