branch develop updated (f6c4c24 -> 00717c6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from f6c4c24 Dans l'UI de gestion avancée du référentiel, l'affichage des dates est différent à droite et à gauche (Fixes #8574) new 00717c6 [GESTION AVANCEE REFERENTIEL] 2 boutons semblent avoir la même fonction (Fixes #8581) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 00717c685ed27edc895d59d080166bde0b20360c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 4 09:45:50 2016 +0200 [GESTION AVANCEE REFERENTIEL] 2 boutons semblent avoir la même fonction (Fixes #8581) Summary of changes: .../synchronize/referential/ng/ReferentialSynchroUI.jcss | 6 ------ .../referential/ng/ReferentialSynchronizeResources.java | 11 +++++++++++ .../referential/ng/action/RegisterDesactivateTaskAction.java | 6 +++--- .../main/resources/i18n/application-swing_en_GB.properties | 8 ++++++-- .../main/resources/i18n/application-swing_es_ES.properties | 8 ++++++-- .../main/resources/i18n/application-swing_fr_FR.properties | 8 ++++++-- 6 files changed, 32 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 00717c685ed27edc895d59d080166bde0b20360c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 4 09:45:50 2016 +0200 [GESTION AVANCEE REFERENTIEL] 2 boutons semblent avoir la même fonction (Fixes #8581) --- .../synchronize/referential/ng/ReferentialSynchroUI.jcss | 6 ------ .../referential/ng/ReferentialSynchronizeResources.java | 11 +++++++++++ .../referential/ng/action/RegisterDesactivateTaskAction.java | 6 +++--- .../main/resources/i18n/application-swing_en_GB.properties | 8 ++++++-- .../main/resources/i18n/application-swing_es_ES.properties | 8 ++++++-- .../main/resources/i18n/application-swing_fr_FR.properties | 8 ++++++-- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss index a256692..e5897ab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss @@ -47,10 +47,7 @@ largeModel:true; minimumSize:{UIHelper.newMinDimension()}; font-size:11; - /*showsRootHandles:false;*/ toggleClickCount:100; - /*model:{getLeftTreeModel()}; - selectionModel:{getStepModel().getLeftTreeModel()};*/ cellRenderer:{new ReferentialSynchronizeTreeCellRenderer()}; } @@ -63,10 +60,7 @@ largeModel:true; minimumSize:{UIHelper.newMinDimension()}; font-size:11; - /*showsRootHandles:false;*/ toggleClickCount:100; - /*model:{getRightTreeModel()}; - selectionModel:{getStepModel().getRightTreeModel()};*/ cellRenderer:{new ReferentialSynchronizeTreeCellRenderer()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java index e9af718..945a80d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java @@ -114,6 +114,17 @@ public enum ReferentialSynchronizeResources { ReferentialSynchroModel.DESACTIVATE_LEFT_PROPERTY_NAME, ReferentialSynchroModel.DESACTIVATE_RIGHT_PROPERTY_NAME, ReferentialSynchronizeTaskType.DESACTIVATE, + ReferenceReferentialSynchroNodeSupport::isCanDelete), + DESACTIVATE_WITH_REPLACEMENT( + "desactivateFromLeft", + "desactivateFromRight", + n("observe.actions.synchro.referential.task.desactivateWithReplaceFromLeftWithReplacement"), + n("observe.actions.synchro.referential.task.desactivateWithReplaceFromRightWithReplacement"), + n("observe.actions.synchro.referential.action.desactivateFromLeftWithReplacement.tip"), + n("observe.actions.synchro.referential.action.desactivateFromRightWithReplacement.tip"), + ReferentialSynchroModel.DESACTIVATE_LEFT_PROPERTY_NAME, + ReferentialSynchroModel.DESACTIVATE_RIGHT_PROPERTY_NAME, + ReferentialSynchronizeTaskType.DESACTIVATE, ReferenceReferentialSynchroNodeSupport::isCanDelete); private final String leftActionName; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java index 806a041..ff3e3b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java @@ -22,11 +22,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DesactivateReferentialSynchronizeTask; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; import static org.nuiton.i18n.I18n.t; @@ -41,7 +41,7 @@ public class RegisterDesactivateTaskAction extends RegisterTasksActionSupport { private static final long serialVersionUID = 1L; public RegisterDesactivateTaskAction(ReferentialSynchroUI ui, boolean left, boolean replace) { - super(ui, ReferentialSynchronizeResources.DESACTIVATE, left, replace); + super(ui, replace ? ReferentialSynchronizeResources.DESACTIVATE_WITH_REPLACEMENT : ReferentialSynchronizeResources.DESACTIVATE, left, replace); } @Override diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 3e25992..4d41196 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -218,7 +218,9 @@ observe.actions.synchro.referential.action.copyToRight.tip=Copy selected referen observe.actions.synchro.referential.action.deleteFromLeft.tip=Delete selected referential(s) from left database observe.actions.synchro.referential.action.deleteFromRight.tip=Delete selected referential(s) from right database observe.actions.synchro.referential.action.desactivateFromLeft.tip=Disable selected referential(s) from left database +observe.actions.synchro.referential.action.desactivateFromLeftWithReplacement.tip=Disable selected referential(s) from left database and replace them observe.actions.synchro.referential.action.desactivateFromRight.tip=Disable selected referential(s) from right database +observe.actions.synchro.referential.action.desactivateFromRightWithReplacement.tip=Disable selected referential(s) from right database and replace them observe.actions.synchro.referential.action.revertFromLeft.tip=Revert selected referential(s) into left database observe.actions.synchro.referential.action.revertFromRight.tip=Revert selected referential(s) into right database observe.actions.synchro.referential.action.skipFromLeft.tip=Do nothing for selected referential(s) from left database @@ -258,8 +260,10 @@ observe.actions.synchro.referential.task.deleteFromLeft=Delete in left database\ observe.actions.synchro.referential.task.deleteFromRight=Delete in right database\: <i>%s</i> - «<b>%s</b>» to replace by «<b>%s</b>» observe.actions.synchro.referential.task.desactivateFromLeft=Disable (without replacement) in left database\: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.referential.task.desactivateFromRight=Disable (without replacement) in right database\: <i>%s</i> - «<b>%s</b>» -observe.actions.synchro.referential.task.desactivateWithReplaceFromLeft=Disable in left database\: <i>%s</i> - «<b>%s</b>» to replace by «<b>%s</b>» -observe.actions.synchro.referential.task.desactivateWithReplaceFromRight=Disable in right database\: <i>%s</i> - «<b>%s</b>» to replace by «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeft=Disable in left database\: <i>%s</i> - «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeftWithReplacement=Disable in left database\: <i>%s</i> - «<b>%s</b>» to replace by «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromRight=Disable in right database\: <i>%s</i> - «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromRightWithReplacement=Disable in right database\: <i>%s</i> - «<b>%s</b>» to replace by «<b>%s</b>» observe.actions.synchro.referential.task.prepare=Register action %s observe.actions.synchro.referential.task.revertFromLeft=Revert in left database\: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.referential.task.revertFromRight=Revert in right database\: <i>%s</i> - «<b>%s</b>» diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 6cc2b9b..0bee3a7 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -218,7 +218,9 @@ observe.actions.synchro.referential.action.copyToRight.tip=Copiar el referencial observe.actions.synchro.referential.action.deleteFromLeft.tip=Eliminar el referencial seleccionado en la base de la izquierda observe.actions.synchro.referential.action.deleteFromRight.tip=Eliminar el referencial seleccionado en la base de la derecha observe.actions.synchro.referential.action.desactivateFromLeft.tip=Desactivar (sin reemplazo) el referential seleccionado en la base de la izquierda +observe.actions.synchro.referential.action.desactivateFromLeftWithReplacement.tip=Desactivar (con reemplazo) el referential seleccionado en la base de la izquierda observe.actions.synchro.referential.action.desactivateFromRight.tip=Desactivar (sin reemplazo) el referential seleccionado en la base de la derecha +observe.actions.synchro.referential.action.desactivateFromRightWithReplacement.tip=Desactivar (con reemplazo) el referential seleccionado en la base de la derecha observe.actions.synchro.referential.action.revertFromLeft.tip=Volver atrás el referencial seleccionado en la izquierda observe.actions.synchro.referential.action.revertFromRight.tip=Volver atrás el referencial seleccionado en la derecha observe.actions.synchro.referential.action.skipFromLeft.tip=No hacer nada sobre el referencial seleccionado en la izquierda @@ -258,8 +260,10 @@ observe.actions.synchro.referential.task.deleteFromLeft=Eliminar en la base de l observe.actions.synchro.referential.task.deleteFromRight=Eliminar en la base de la izquierda \: <i>%s</i> - «<b>%s</b>» debe ser reemplazado por «<b>%s</b>» observe.actions.synchro.referential.task.desactivateFromLeft=Desactivar (sin reemplazo) en la base de la iquierda \: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.referential.task.desactivateFromRight=Desactivar (sin reemplazo) en la base de la derecha \: <i>%s</i> - «<b>%s</b>» -observe.actions.synchro.referential.task.desactivateWithReplaceFromLeft=Desactivar en la base de la iquierda \: <i>%s</i> - «<b>%s</b>» debe ser reemplazado por «<b>%s</b>» -observe.actions.synchro.referential.task.desactivateWithReplaceFromRight=Desactivar en la base de la derecha \: <i>%s</i> - «<b>%s</b>» debe ser reemplazado por «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeft=Desactivar en la base de la iquierda \: <i>%s</i> - «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeftWithReplacement=Desactivar en la base de la iquierda \: <i>%s</i> - «<b>%s</b>» debe ser reemplazado por «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromRight=Desactivar en la base de la derecha \: <i>%s</i> - «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromRightWithReplacement=Desactivar en la base de la derecha \: <i>%s</i> - «<b>%s</b>» debe ser reemplazado por «<b>%s</b>» observe.actions.synchro.referential.task.prepare=Registro de la acción %s observe.actions.synchro.referential.task.revertFromLeft=Volver atrás en la base de la izquierda \: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.referential.task.revertFromRight=Volver atrás en la base de la derecha \: <i>%s</i> - «<b>%s</b>» diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 1f0bd21..6b08c0c 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -218,7 +218,9 @@ observe.actions.synchro.referential.action.copyToRight.tip=Copier le référenti observe.actions.synchro.referential.action.deleteFromLeft.tip=Supprimer le reférentiel sélectionnée de la base de gauche observe.actions.synchro.referential.action.deleteFromRight.tip=Supprimer le référentiel sélectionnée de la base de droite observe.actions.synchro.referential.action.desactivateFromLeft.tip=Désactiver (sans remplacement) le référentiel sélectionné dans la base de gauche +observe.actions.synchro.referential.action.desactivateFromLeftWithReplacement.tip=Désactiver (avec remplacement) le référentiel sélectionné dans la base de gauche observe.actions.synchro.referential.action.desactivateFromRight.tip=Désactiver (sans remplacement) le référentiel sélectionné dans la base de droite +observe.actions.synchro.referential.action.desactivateFromRightWithReplacement.tip=Désactiver (avec remplacement) le référentiel sélectionné dans la base de droite observe.actions.synchro.referential.action.revertFromLeft.tip=Revenir en arrière du référentiel sélectionné à gauche observe.actions.synchro.referential.action.revertFromRight.tip=Revenir en arrière du référentiel sélectionné à droite observe.actions.synchro.referential.action.skipFromLeft.tip=Ne rien faire sur le référentiel sélectionné à gauche @@ -258,8 +260,10 @@ observe.actions.synchro.referential.task.deleteFromLeft=Supprimer dans la base d observe.actions.synchro.referential.task.deleteFromRight=Supprimer dans la base de droite \: <i>%s</i> - «<b>%s</b>» à remplacer par «<b>%s</b>» observe.actions.synchro.referential.task.desactivateFromLeft=Désactiver (sans remplacement) dans la base de gauche \: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.referential.task.desactivateFromRight=Désactiver (sans remplacement) dans la base dans droite \: <i>%s</i> - «<b>%s</b>» -observe.actions.synchro.referential.task.desactivateWithReplaceFromLeft=Désactiver dans la base de gauche \: <i>%s</i> - «<b>%s</b>» à remplacer par «<b>%s</b>» -observe.actions.synchro.referential.task.desactivateWithReplaceFromRight=Désactiver dans la base de droite \: <i>%s</i> - «<b>%s</b>» à remplacer par «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeft=Désactiver dans la base de gauche \: <i>%s</i> - «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromLeftWithReplacement=Désactiver dans la base de gauche \: <i>%s</i> - «<b>%s</b>» à remplacer par «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromRight=Désactiver dans la base de droite \: <i>%s</i> - «<b>%s</b>» +observe.actions.synchro.referential.task.desactivateWithReplaceFromRightWithReplacement=Désactiver dans la base de droite \: <i>%s</i> - «<b>%s</b>» à remplacer par «<b>%s</b>» observe.actions.synchro.referential.task.prepare=Enregistement de l'action %s observe.actions.synchro.referential.task.revertFromLeft=Revenir en arrière dans la base de gauche \: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.referential.task.revertFromRight=Revenir en arrière dans la base de droite \: <i>%s</i> - «<b>%s</b>» -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm