Author: bleny Date: 2014-06-23 21:47:33 +0200 (Mon, 23 Jun 2014) New Revision: 2090 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2090 Log: fixes #5312 remove obsmer filters from obsvente Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 19:36:40 UTC (rev 2089) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 19:47:33 UTC (rev 2090) @@ -223,12 +223,16 @@ <fieldset> - <s:checkbox name="filter.mammalsObservationOnly" - label="%{getText('wao.ui.misc.observations')}"/> + <s:if test="obsMer"> - <s:checkbox name="filter.mammalsCaptureOnly" - label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + <s:checkbox name="filter.mammalsObservationOnly" + label="%{getText('wao.ui.misc.observations')}"/> + <s:checkbox name="filter.mammalsCaptureOnly" + label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + + </s:if> + <s:checkbox name="filter.commentDefinedOnly" label="%{getText('wao.ui.field.Contact.comment')}"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 19:36:40 UTC (rev 2089) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 19:47:33 UTC (rev 2090) @@ -155,12 +155,16 @@ <fieldset> - <s:checkbox name="filter.mammalsObservationOnly" - label="%{getText('wao.ui.misc.observations')}"/> + <s:if test="obsMer"> - <s:checkbox name="filter.mammalsCaptureOnly" - label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + <s:checkbox name="filter.mammalsObservationOnly" + label="%{getText('wao.ui.misc.observations')}"/> + <s:checkbox name="filter.mammalsCaptureOnly" + label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/> + + </s:if> + <s:checkbox name="filter.commentDefinedOnly" label="%{getText('wao.ui.field.Contact.comment')}"/>