| /branches/v1.8-narince/scripts/modules/import/Import.php |
|---|
| 7,12 → 7,17 |
| private $bdd = null; |
| private $auteurs = array(); |
| protected $parametres_autorises = array( |
| '-n' => array(true, false, 'Nom du fichier à importer.')); |
| '-n' => array(true, false, 'Nom du fichier à importer.'), |
| '-u' => array(false, false, 'Infos utilisateur sous forme de JSON contenant : id, session et ip')); |
| protected $table_publication = null; |
| protected $table_auteur = null; |
| protected $table_publication_a_auteur = null; |
| protected $table_meta = null; |
| protected $id_table_publication = null; |
| protected $id_table_publication_personne = null; |
| protected $id_role_auteur = null; |
| protected $colonnes_obligatoires = array(); |
| 22,6 → 27,12 |
| protected $auteurs_a_publis = array(); |
| protected $publis_a_auteurs = array(); |
| protected $id_utilisateur = 0; |
| protected $id_session = 0; |
| protected $ip_utilisateur = "127.0.01"; |
| const ETAT_AJOUTER = 1; |
| public function __construct($script_nom, $parametres) { |
| parent::__construct($script_nom, $parametres); |
| $this->bdd = new Bdd(); |
| 32,6 → 43,10 |
| $this->initialiserScript(); |
| $cmd = $this->getParametre('a'); |
| $fichier = $this->getParametre('n'); |
| $utilisateur = $this->getParametre('u'); |
| $this->traiterInfosUtilisateur($utilisateur); |
| switch ($cmd) { |
| case "import" : |
| $resultat = $this->charger($fichier); break; |
| 48,6 → 63,15 |
| exit; |
| } |
| private function traiterInfosUtilisateur($utilisateur) { |
| $utilisateur_infos = json_decode($utilisateur, true); |
| if(!empty($utilisateur_infos)) { |
| $this->id_utilisateur = !empty($utilisateur_infos['id']) ? $utilisateur_infos['id'] : $this->id_utilisateur; |
| $this->id_session = !empty($utilisateur_infos['session']) ? $utilisateur_infos['session'] : $this->id_session; |
| $this->ip_utilisateur = !empty($utilisateur_infos['ip']) ? $utilisateur_infos['ip'] : $this->ip_utilisateur; |
| } |
| } |
| private function initialiserScript() { |
| $fichierIni = $this->getScriptChemin().'import.ini'; |
| if (file_exists($fichierIni)) { |
| 65,7 → 89,11 |
| $this->table_publication = $tables['publication']; |
| $this->table_auteur = $tables['auteur']; |
| $this->table_publication_a_auteur = $tables['publication_a_auteur']; |
| $this->table_meta = $tables['meta']; |
| $this->id_table_publication = $tables['id_table_publication']; |
| $this->id_table_publication_personne = $tables['id_table_publication_personne']; |
| $this->id_role_auteur = $tables['id_role_auteur']; |
| } |
| 108,85 → 136,143 |
| } |
| $roles_a_num_colonnes = array_flip($index_colonnes_importees); |
| // Ajout de la colonne nom complet aux champs de la requête |
| $colonnes_importees[] = 'cpu_fmt_nom_complet'; |
| $nb_publis_inserees = 0; |
| $lignes = array(); |
| while($ligne = fgetcsv($pointeur, 0, ";")) { |
| $ligne_inseree = array(); |
| // Traitement des champs suivant leur role |
| foreach($ligne as $index => &$valeur) { |
| if(!in_array($index, $index_colonnes_refusees)) { |
| $ligne_inseree[] = $this->traiterChamp($valeur, $index_colonnes_importees[$index]); |
| } |
| } |
| // Ajout du nom complet formaté de la publication |
| $nom_complet = $this->bdd->proteger($this->formaterNomComplet($ligne, $index_colonnes_importees)); |
| $ligne_inseree[] = $nom_complet; |
| $lignes[] = "(".implode(",", $ligne_inseree).")"; |
| $id_publication = $this->insererPublication($colonnes_importees, $ligne_inseree); |
| // TODO: quoi faire en cas d'échec pour une publication ? |
| if(!empty($id_publication)) { |
| $nb_publis_inserees++; |
| // Pour aller plus vite on pourrait éventuellement faire une grosse requete d'ajout des publications |
| // à personne à la fin, mais ça nous priverait de faire une transaction (TODO: faire une transaction) |
| $nb_auteurs_lies = $this->insererLiensPublicationAuteurs($id_publication, $ligne[$roles_a_num_colonnes['auteur']]); |
| } |
| $this->stockerAuteursPourLiaisons($ligne[$roles_a_num_colonnes['auteur']], $nom_complet); |
| } |
| // Ajout de la colonne nom complet aux champs de la requête |
| $colonnes_importees[] = 'cpu_fmt_nom_complet'; |
| // le script renvoie le nombre de publications importées |
| $nb_publis_inserees = $this->insererPublications($colonnes_importees, $lignes); |
| $nb_auteurs_lies = $this->insererLiensPublicationsAuteurs(); |
| return $nb_publis_inserees; |
| } |
| private function stockerAuteursPourLiaisons($infos_auteurs, $nom_complet_publication) { |
| // Découpage des différents auteurs |
| $auteurs_tab = explode(',', $infos_auteurs); |
| $auteurs_tab = array_filter($auteurs_tab); |
| foreach($auteurs_tab as $auteur) { |
| // si les infos auteurs sont un tableau dans le cache alors son id existe bien en base de données |
| if(is_array($this->cache_auteur[$auteur])) { |
| // ajout d'une correspondance entre le nom complet de la publi et l'auteur (pour liaison ultérieure) |
| // et vice versa, ce qui permet facilement de retrouver à quel auteur est lié quelle publi dans les deux sens |
| $this->auteurs_a_publi[$auteur][] = $nom_complet_publication; |
| $this->publis_a_auteurs[$nom_complet_publication][] = $auteur; |
| } |
| } |
| private function insererPublication(&$colonnes, &$publication) { |
| $requete = "INSERT INTO ".$this->table_publication." ". |
| "(".implode(',', $colonnes).") ". |
| "VALUES (".implode(",", $publication).")"; |
| $insertion = $this->bdd->executer($requete); |
| $id_publi = $this->bdd->recupererIdDernierAjout(); |
| // Historisation de l'ajout |
| $histo = $this->creerXmlHisto(array_combine($colonnes, $publication)); |
| $id_meta = $this->historiser($this->id_table_publication, $id_publi, $histo); |
| // Affectation des méta données concernat l'ajout à la publication |
| $requete_affectation_meta = "UPDATE ".$this->table_publication." ". |
| "SET cpu_ce_meta = ".$id_meta." ". |
| "WHERE cpu_id_publication = ".$id_publi; |
| $this->bdd->executer($requete_affectation_meta); |
| return $id_publi; |
| } |
| protected function insererLiensPublicationsAuteurs() { |
| $champs = array('cpuap_id_publication', 'cpuap_id_personne', 'cpuap_id_role', 'cpuap_ce_truk_type', 'cpuap_ordre', 'cpuap_ce_meta'); |
| protected function insererLiensPublicationAuteurs($id_publication, &$auteurs) { |
| $colonnes = array('cpuap_id_publication', 'cpuap_id_personne', 'cpuap_id_role', 'cpuap_ce_truk_type', 'cpuap_ordre', 'cpuap_ce_meta'); |
| $requete = "INSERT IGNORE INTO ".$this->table_publication_a_auteur." ". |
| "(".implode(",", $champs).") VALUES "; |
| "(".implode(",", $colonnes).") VALUES "; |
| foreach($this->auteurs_a_publi as $auteur => $publis) { |
| // L'ordre des auteurs commence à 1 |
| $ordre_auteur = 1; |
| // Découpage des différents auteurs |
| $auteurs_tab = explode(',', $auteurs); |
| $auteurs_tab = array_filter($auteurs_tab); |
| // Les auteurs sont normalement cités dans l'ordre dans l'import |
| foreach($auteurs_tab as $auteur) { |
| // si les infos auteurs sont un tableau dans le cache alors l'id existe bien en base de données |
| if(is_array($this->cache_auteur[$auteur])) { |
| $id_auteur = $this->cache_auteur[$auteur]['cp_id_personne']; |
| $valeurs = array($id_publication, $id_auteur, $this->id_role_auteur, "NULL", $ordre_auteur, "0"); |
| $id_auteur = $this->cache_auteur[$auteur]['cp_id_personne']; |
| // Pour chaque publication importée à laquelle est liée l'auteur |
| // il peut avoir un ordre différent |
| foreach($publis as $publi) { |
| $requete_insertion = $requete." (".implode(',', $valeurs).") "; |
| $liaison = $this->bdd->executer($requete_insertion); |
| // Historisation de l'ajout |
| $histo = $this->creerXmlHisto(array_combine($colonnes, $liaison)); |
| $cle_liaison = $id_publication.'-'.$this->id_role_auteur.'-'.$id_auteur; |
| $id_meta = $this->historiser($this->id_table_publication_personne, $cle_liaison, $histo); |
| // l'ordre des auteurs commence à 1, les auteurs sont stockés dans l'ordre dans publis_a_auteurs |
| $ordre_auteur = array_search($auteur, $this->publis_a_auteurs[$publi]) + 1; |
| // Le nom complet de la publication est normalement unique et donc peut servir à retrouver |
| // les publications qui ont été insérées par lot (sans en récupérer l'id) |
| $sous_requete_id_publi = "SELECT cpu_id_publication FROM coel_publication ". |
| "WHERE cpu_fmt_nom_complet IN (".$publi.") "; |
| $requete_insertion = $requete." (". |
| " (".$sous_requete_id_publi."), ". |
| $this->bdd->proteger($id_auteur).", ". |
| $this->id_role_auteur.", ". |
| "NULL ,". |
| $ordre_auteur.", ". |
| "NULL". |
| ") "; |
| $insertion = $this->bdd->executer($requete_insertion); |
| } |
| // Affectation des méta données concernant l'ajout à la publication à auteur |
| $requete_affectation_meta = "UPDATE ".$this->table_publication_a_auteur." ". |
| "SET cpuap_ce_meta = ".$id_meta; |
| $this->bdd->executer($requete_affectation_meta); |
| } |
| // L'ordre des auteurs est conservé même pour ceux qui n'existe pas dans la bdd |
| $ordre_auteur++; |
| } |
| // TODO: quoi faire en ce qui concerne l'insertion des auteurs ? |
| // et le nombre inséré, les éventuels échecs de la requête ? |
| } |
| protected function creerXmlHisto($donnees) { |
| // Création du xml de l'enregistrement à historiser |
| $info = null; |
| $xml_tpl = '<?xml version="1.0" encoding="UTF-8" ?>'."\n<resultset>\n<row>\n%s</row>\n</resultset>"; |
| $xml = null; |
| foreach ($donnees as $cle => $valeur) { |
| // Pour éviter un éventuel double échappement des valeurs |
| $valeur = stripslashes($valeur); |
| $valeur = trim($valeur, "'"); |
| if (!is_null($valeur) && $valeur != '') { |
| $xml .= "<$cle>$valeur</$cle>\n"; |
| } |
| } |
| if ($xml !== null) { |
| $info = sprintf($xml_tpl, $xml); |
| $info = $this->bdd->proteger($info); |
| } |
| return $info; |
| } |
| protected function historiser($table_id, $ligne_cle, $info) { |
| date_default_timezone_set('Europe/Paris'); |
| // Pré-traitement des variables |
| $info = (is_null($info)) ? 'NULL' : $info; |
| // Historisation (Ajout des méta-données) |
| $requete = 'INSERT INTO coel_meta_historique_ligne '. |
| ' (cmhl_ce_table, cmhl_cle_ligne, cmhl_enregistrement, cmhl_date_modification, cmhl_ce_modifier_par, cmhl_ce_etat, cmhl_ip, cmhl_session_id) '. |
| 'VALUES ('. |
| " $table_id, ". |
| ' "'.$ligne_cle.'", '. |
| " $info, ". |
| ' "'.date('Y-m-d H:i:s', time()).'", '. |
| " $this->id_utilisateur, ". |
| " ".self::ETAT_AJOUTER.", ". |
| ' "'.$this->ip_utilisateur.'", '. |
| ' "'.$this->id_session.'") '; |
| $resultat = $this->bdd->executer($requete); |
| return $this->bdd->recupererIdDernierAjout(); |
| } |
| protected function formaterNomComplet($ligne, $roles) { |
| $roles = array_flip($roles); |
| 228,26 → 314,6 |
| return $fmt_nom_complet; |
| } |
| private function insererPublications(&$colonnes, &$publications) { |
| // Une insertion par tranche de 1000 permet d'insérer sans avoir de mysql |
| // timeout qui nécessite de réveiller la connexion de temps en temps. |
| // TODO: transactions ? |
| $tranches_publis = array_chunk($publications, 1000); |
| $nb_publis_inserees = 0; |
| foreach($tranches_publis as $tranche) { |
| $requete = "INSERT INTO ".$this->table_publication." ". |
| "(".implode(',', $colonnes).") ". |
| "VALUES ".implode(","."\n", $tranche)."\n"; |
| $nb_publis_inserees += $this->bdd->executer($requete); |
| } |
| return $nb_publis_inserees; |
| } |
| private function traiterChamp($valeur, $role) { |
| switch($role) { |
| case 'auteur': |
| 290,12 → 356,15 |
| $requete = "SELECT cp_id_personne, cp_fmt_nom_complet FROM ".$this->table_auteur." WHERE cp_fmt_nom_complet IN ".$auteur_req; |
| $infos_auteur = $this->bdd->recupererTous($requete); |
| // Stockage en cache de la ligne de bdd si trouvé, |
| // de la valeur brute sinon |
| if(!empty($infos_auteur)) { |
| $retour = $infos_auteur[0]['cp_fmt_nom_complet']; |
| $this->cache_auteur[$auteur_intitule] = $infos_auteur[0]; |
| // Stocker le nom d'auteur sous les deux formes (fmt nom complet et tel que saisi), facilite la recherche |
| // plus tard lors de la liaison des publications aux auteurs |
| $this->cache_auteur[$infos_auteur[0]['cp_fmt_nom_complet']] = $infos_auteur[0]; |
| } else { |
| $retour = $auteur_intitule; |
| $this->cache_auteur[$auteur_intitule] = $auteur_intitule; |
| /branches/v1.8-narince/scripts/modules/import/import.ini |
|---|
| 5,7 → 5,10 |
| publication = "coel_publication" |
| auteur = "coel_personne" |
| publication_a_auteur = "coel_publication_a_personne" |
| meta = "coel_meta" |
| id_role_auteur = 2360; |
| id_table_publication = 118 |
| id_table_publication_personne = 119; |
| [champs] |
| editeur = cpu_ce_truk_editeur |
| /branches/v1.8-narince/src/org/tela_botanica/client/configuration |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/configuration:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/util |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/util:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/http |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/http:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/Constantes.properties |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.properties:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/ErrorMessages.properties |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.properties:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/Constantes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/ErrorMessages.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n: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/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/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 |
|---|
| 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 |
|---|
| 41,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 { |
| 153,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 |
| /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/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/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/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 |
|---|
| 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/interfaces |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/interfaces:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/HashMapComposants.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/InfoLogger.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/InfoLogger.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/AproposFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/IdentificationFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/Proxy.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/Proxy.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampCaseACocher.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/LicenceFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/AideFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AideFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Valeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Valeur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Aide.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Aide.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Menu.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Menu.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/MenuApplicationId.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/MenuApplicationId.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonnee.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonnee.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/Personne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/Personne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Utilisateur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Utilisateur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonneeListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonneeListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteRangement.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/Collection.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteBase.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureConservation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/Structure.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeurListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Information.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Information.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/Publication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/Publication.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles:r1882 |