Author: tchemit Date: 2014-04-15 15:41:07 +0200 (Tue, 15 Apr 2014) New Revision: 1889 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1889 Log: refs #4487 fix mainObserver on edit page + set contact id in session after an update Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-04-15 09:42:54 UTC (rev 1888) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-04-15 13:41:07 UTC (rev 1889) @@ -177,7 +177,7 @@ updateContactCommand = service.newUpdateContactCommand(getAuthenticatedWaoUser(), optionalContactId); observers = new TreeMap<>(); - List<WaoUser> waoUsers = waoUsersService.getActiveWaoUsers(Optional.of(getAuthenticatedWaoUser().getCompany().getTopiaId())); + List<WaoUser> waoUsers = waoUsersService.getActiveWaoUsers(Optional.of(updateContactCommand.getContact().getSampleRow().getCompany().getTopiaId())); for (WaoUser waoUser : waoUsers) { observers.put(waoUser.getTopiaId(), waoUser.getFullName()); } @@ -292,8 +292,9 @@ service.save(updateContactCommand, false); - session.addMessage(t("wao.ui.form.updateContactCommand.success", - updateContactCommand.getContact().getMainObserver().getFullName())); + session.addMessage(t("wao.ui.form.updateContactCommand.success")); + + session.setContactToHighlightId(updateContactCommand.getContact().getTopiaId()); return SUCCESS; } } \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-04-15 09:42:54 UTC (rev 1888) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-04-15 13:41:07 UTC (rev 1889) @@ -108,8 +108,7 @@ <s:set name="editObservers" value="%{authenticatedWaoUser.isAuthorizedToEditContactObservers(updateContactCommand.contact)}"/> - <s:select name="updateContactCommand.contact.mainObserver" - value="%{updateContactCommand.contact.mainObserver.topiaId}" + <s:select name="updateContactCommand.contact.mainObserver.topiaId" label="%{getText('wao.ui.field.Contact.mainObserver')}" list="observers" emptyOption="true"