Author: kmorin Date: 2013-03-28 11:05:30 +0100 (Thu, 28 Mar 2013) New Revision: 698 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/698 Log: fixes #1840 [REFERENTIEL] - Gestion des fonctionnalit?\195?\169s administrateur Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config 2013-03-28 00:20:21 UTC (rev 697) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config 2013-03-28 10:05:30 UTC (rev 698) @@ -24,4 +24,6 @@ tutti.version=${project.version} tutti.site.url=${project.url} tutti.inceptionYear=${project.inceptionYear} -tutti.organizationName=${license.organizationName} \ No newline at end of file +tutti.organizationName=${license.organizationName} +# the password is ifremer +tutti.admin.password=ef399a6e6ec62c6e142440241a5b98f8 \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-03-28 00:20:21 UTC (rev 697) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-03-28 10:05:30 UTC (rev 698) @@ -25,11 +25,10 @@ */ import fr.ifremer.tutti.ui.swing.TuttiScreen; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.nuiton.util.StringUtil; -import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; +import javax.swing.*; import static org.nuiton.i18n.I18n._; @@ -49,19 +48,29 @@ protected boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { - String answer = JOptionPane.showInputDialog(getContext().getActionUI(), - _("tutti.manageTemporaryReferential.passwordDialog.message"), - _("tutti.manageTemporaryReferential.passwordDialog.title"), - JOptionPane.WARNING_MESSAGE); - if (answer != null) { - String cryptedAnswer = StringUtil.encodeMD5(answer); - String correctAnswer = StringUtil.encodeMD5("test"); - //TODO kmorin 20130327 error message if wrong password - result = StringUtils.equals(cryptedAnswer, correctAnswer); + String answer = null; + do { + answer = JOptionPane.showInputDialog(getContext().getActionUI(), + _("tutti.manageTemporaryReferential.passwordDialog.message"), + _("tutti.manageTemporaryReferential.passwordDialog.title"), + JOptionPane.WARNING_MESSAGE); + if (answer != null) { + String cryptedAnswer = StringUtil.encodeMD5(answer); + String correctAnswer = getConfig().getApplicationConfig().getOption("tutti.admin.password"); + result = StringUtils.equals(cryptedAnswer, correctAnswer); - } else { - result = false; - } + if (!result) { + JOptionPane.showMessageDialog(getContext().getActionUI(), + _("tutti.manageTemporaryReferential.passwordDialog.error.message"), + _("tutti.manageTemporaryReferential.passwordDialog.error.title"), + JOptionPane.ERROR_MESSAGE); + } + + } else { + result = false; + } + + } while (!result && answer != null); } return result; } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-28 00:20:21 UTC (rev 697) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-28 10:05:30 UTC (rev 698) @@ -856,6 +856,8 @@ tutti.manageTemporaryReferential.field.species.tip= tutti.manageTemporaryReferential.field.vessel= tutti.manageTemporaryReferential.field.vessel.tip= +tutti.manageTemporaryReferential.passwordDialog.error.message= +tutti.manageTemporaryReferential.passwordDialog.error.title= tutti.manageTemporaryReferential.passwordDialog.message= tutti.manageTemporaryReferential.passwordDialog.title= tutti.manageTemporaryReferential.title= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-28 00:20:21 UTC (rev 697) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-28 10:05:30 UTC (rev 698) @@ -860,6 +860,8 @@ tutti.manageTemporaryReferential.field.species.tip= tutti.manageTemporaryReferential.field.vessel=Référentiel Navire tutti.manageTemporaryReferential.field.vessel.tip= +tutti.manageTemporaryReferential.passwordDialog.error.message=Le mot de passe que vous avez entré est incorrect. +tutti.manageTemporaryReferential.passwordDialog.error.title=Mot de passe incorrect tutti.manageTemporaryReferential.passwordDialog.message=Vous souhaitez entrer dans une partie sensible de l'application.\nVous devez entrer le mot de passe pour entrer. tutti.manageTemporaryReferential.passwordDialog.title=Zone sensible tutti.manageTemporaryReferential.title=importer des référentiels temporaires