Author: bleny Date: 2010-12-24 15:55:29 +0000 (Fri, 24 Dec 2010) New Revision: 860 Log: make profiles edition program-independant Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 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 2010-12-24 15:10:34 UTC (rev 859) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-12-24 15:55:29 UTC (rev 860) @@ -32,10 +32,21 @@ import fr.ifremer.wao.bean.GlobalIndicatorValue; import fr.ifremer.wao.bean.GlobalSynthesisParameters; import fr.ifremer.wao.bean.UserRole; -import fr.ifremer.wao.entity.*; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.CompanyImpl; +import fr.ifremer.wao.entity.Indicator; +import fr.ifremer.wao.entity.IndicatorLevel; +import fr.ifremer.wao.entity.UserProfile; +import fr.ifremer.wao.entity.UserProfileImpl; +import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; -import fr.ifremer.wao.service.*; +import fr.ifremer.wao.service.ServiceBoat; +import fr.ifremer.wao.service.ServiceCartography; +import fr.ifremer.wao.service.ServiceReferential; +import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.service.ServiceSynthesis; +import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.ErrorReport; import fr.ifremer.wao.ui.data.GenericSelectModel; @@ -48,7 +59,14 @@ import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.Environmental; +import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.beaneditor.Validate; import org.apache.tapestry5.corelib.components.BeanEditForm; @@ -496,7 +514,7 @@ } else { // set may be buggy // getUserEdited().setUserProfile(getEditedUserProfiles()); - getUserEdited().clearUserProfile(); + getUserEdited().clearUserProfile(currentUser.getProfile().getObsProgram()); getUserEdited().addAllUserProfile(getEditedUserProfiles()); } } @@ -616,10 +634,8 @@ @Log public List<UserProfile> getEditedUserProfiles() { if (editedUserProfiles == null) { - if (getUserEdited() != null && getUserEdited().getUserProfile() != null) { - editedUserProfiles = new ArrayList<UserProfile>(getUserEdited().getUserProfile()); - } else { - editedUserProfiles = new ArrayList<UserProfile>(); + if (getUserEdited() != null) { + editedUserProfiles = getUserEdited().getUserProfile(currentUser.getProfile().getObsProgram()); } } return editedUserProfiles;