X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteApp.java;h=204688d81b360bf7c9b34673ced7d55c33ec70b3;hb=330996fb36d95edaf30d0dc2086aa549155464c3;hp=63e332450bfdaf3e10e4c6a181c7e46637e0c9f7;hpb=247704a6b37b93db0d03aa4c8eeba97cfab004eb;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java index 63e3324..204688d 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java @@ -1,7 +1,6 @@ package org.argeo.app.ui; import static org.argeo.api.cms.CmsView.CMS_VIEW_UID_PROPERTY; -import static org.argeo.cms.acr.ContentUtils.SLASH; import java.util.Collections; import java.util.HashMap; @@ -36,7 +35,7 @@ import org.argeo.cms.AbstractCmsApp; import org.argeo.cms.CmsUserManager; import org.argeo.cms.LocaleUtils; import org.argeo.cms.Localized; -import org.argeo.cms.acr.CmsContentRepository; +import org.argeo.cms.acr.ContentUtils; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.jcr.acr.JcrContent; import org.argeo.cms.swt.CmsSwtUtils; @@ -45,7 +44,6 @@ import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ux.CmsUxUtils; import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.jcr.JcrException; -import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.LangUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -574,10 +572,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { User user = cmsUserManager.getUser(username); if (user == null) return null; - UserDirectory userDirectory = cmsUserManager.getUserDirectory(user); - path = CmsContentRepository.DIRECTORY_BASE + SLASH + userDirectory.getGlobalId() + SLASH - + userDirectory.getRolePath(user); - node = contentSession.get(path); + node = ContentUtils.roleToContent(cmsUserManager, contentSession, user); // LdapName userDn; // try { // userDn = new LdapName(user.getName());