Author: bleny Date: 2011-01-26 10:03:54 +0000 (Wed, 26 Jan 2011) New Revision: 946 Log: fix misc minor issues Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-01-26 09:05:34 UTC (rev 945) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-01-26 10:03:54 UTC (rev 946) @@ -616,7 +616,7 @@ } private OptionModel newUserRoleOption(UserRole role) { - return new OptionModelImpl(messages.get(role.toString()), role); + return new OptionModelImpl(role.toString(), role); } @Log Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-01-26 09:05:34 UTC (rev 945) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-01-26 10:03:54 UTC (rev 946) @@ -594,7 +594,10 @@ sampleRowModel = beanModelSource.createEditModel(SampleRow.class, resources.getMessages()); sampleRowModel.add("company", null); sampleRowModel.add("boats", null); - sampleRowModel.include("code", "company", "nbObservants", "averageTideTime", "boats", "comment"); + sampleRowModel.include("code", "company", "boats", "comment"); + if (user.getProfile().getObsProgram() == ObsProgram.OBSMER) { + sampleRowModel.include("code", "company", "nbObservants", "averageTideTime", "boats", "comment"); + } if (user.getProfile().getObsProgram() == ObsProgram.OBSVENTE) { sampleRowModel.add("samplingStrategy"); } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties 2011-01-26 09:05:34 UTC (rev 945) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties 2011-01-26 10:03:54 UTC (rev 946) @@ -26,7 +26,7 @@ professionSelect-label: Code m\u00e9tier dcf5codes-label: Code DCF Niv. 5* meshSize-label: Maillage (mm) -size-label: Taille (mm) +size-label: Taille du navire (m) other-label: Autre information libelle-label: Libell\u00e9 species-label: Esp\u00e8ces cibles