This is an automated email from the git hooks/post-receive script. New commit to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git commit cceafbecc5173a9a0f7192c2d805dd5be807b334 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 14:34:39 2014 +0100 Filtres scléro pour l'onglet Contacts --- .../src/main/webapp/WEB-INF/content/contacts.jsp | 61 ++++++++++++++-------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp index b3df83d..c62d67d 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp @@ -36,7 +36,7 @@ <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> { filterName: 'sampleRowFilter.organisationIds', - filterLabel: "<s:text name="wao.ui.entity.Company"/>", + filterLabel: "<s:text name="wao.ui.entity.Organisation"/>", filterValuesField: 'sampleRowsFilterValues.companies', }, </s:if> @@ -67,30 +67,32 @@ filterValuesField: 'terrestrialLocations' }, </s:if> - { - filterName: 'sampleRowFilter.fishingGearDcfIds', - filterLabel: "<s:text name="wao.ui.entity.fishingGearDcf"/>", - filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs', - }, - { - filterName: 'sampleRowFilter.targetSpeciesDcfIds', - filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDcf"/>", - filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', - }, - <s:if test="authenticatedWaoUser.authorizedToFilterOnBoats"> + <s:if test="obsMer || obsVente"> + { + filterName: 'sampleRowFilter.fishingGearDcfIds', + filterLabel: "<s:text name="wao.ui.entity.fishingGearDcf"/>", + filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs', + }, + { + filterName: 'sampleRowFilter.targetSpeciesDcfIds', + filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDcf"/>", + filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', + }, + <s:if test="authenticatedWaoUser.authorizedToFilterOnBoats"> + { + filterName: 'boatFilter.boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boatsFilterValues.boats', + minimumInputLength: 3 + }, + </s:if> { - filterName: 'boatFilter.boatIds', - filterLabel: "<s:text name="wao.ui.entity.Boat"/>", - filterValuesField: 'boatsFilterValues.boats', - minimumInputLength: 3 + filterName: 'boatFilter.districtIds', + filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", + filterValuesField: 'boatsFilterValues.districts' }, </s:if> { - filterName: 'boatFilter.districtIds', - filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", - filterValuesField: 'boatsFilterValues.districts' - }, - { filterName: 'observerIds', filterLabel: "<s:text name="wao.ui.misc.observer"/>", filterValuesField: 'observers' @@ -144,6 +146,23 @@ filterValuesField: 'completeSamplings' } </s:if> + <s:if test="sclerochronology"> + { + filterName: 'sampleRowFilter.sclerochronologySamplingContexts', + filterLabel: "<s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/>", + filterValuesField: 'sampleRowsFilterValues.sclerochronologySamplingContexts' + }, + { + filterName: 'sampleRowFilter.individualMeasurementStrategies', + filterLabel: "<s:text name="wao.ui.field.SampleRow.individualMeasurementStrategy"/>", + filterValuesField: 'sampleRowsFilterValues.individualMeasurementStrategies' + }, + { + filterName: 'sampleRowFilter.species', + filterLabel: "<s:text name="wao.ui.field.SampleRow.species"/>", + filterValuesField: 'sampleRowsFilterValues.species' + } + </s:if> ]; filter = <s:property value="filter" escapeHtml="false"/>; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.