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 e3d91c2b66fb6bf04f47cc15c730df08f48d34f8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 14:37:53 2014 +0100 Correction filtre organisation de l'onglet contact --- wao-web/src/main/webapp/WEB-INF/content/contacts.jsp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 c62d67d..0b31a71 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp @@ -36,8 +36,13 @@ <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> { filterName: 'sampleRowFilter.organisationIds', - filterLabel: "<s:text name="wao.ui.entity.Organisation"/>", - filterValuesField: 'sampleRowsFilterValues.companies', + <s:if test="obsMer || obsVente"> + filterLabel: "<s:text name="wao.ui.entity.Company"/>", + </s:if> + <s:else> + filterLabel: "<s:text name="wao.ui.entity.Organisation"/>", + </s:else> + filterValuesField: 'sampleRowsFilterValues.organisations', }, </s:if> { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.