NIHVIVO-2343 Add profileUri to each proxy (if they have a profile) so it can be used when filtering the auto-complete.
This commit is contained in:
parent
7fc674b23f
commit
e4fe6aa812
1 changed files with 26 additions and 3 deletions
|
@ -12,6 +12,9 @@ import java.util.Map;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
|
||||||
|
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
|
||||||
|
import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
|
||||||
|
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
|
||||||
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
|
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
|
||||||
import edu.cornell.mannlib.vitro.webapp.controller.AbstractPageHandler;
|
import edu.cornell.mannlib.vitro.webapp.controller.AbstractPageHandler;
|
||||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||||
|
@ -135,8 +138,14 @@ public class ManageProxiesListPage extends AbstractPageHandler {
|
||||||
.getPlaceholderImagePathForType(VitroVocabulary.USERACCOUNT);
|
.getPlaceholderImagePathForType(VitroVocabulary.USERACCOUNT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UserAccount ua = userAccountsDao.getUserAccountByUri(item.getUri());
|
||||||
|
List<Individual> profiles = SelfEditingConfiguration.getBean(vreq)
|
||||||
|
.getAssociatedIndividuals(indDao, ua);
|
||||||
|
String profileUri = (profiles.isEmpty()) ? "" : profiles.get(0)
|
||||||
|
.getURI();
|
||||||
|
|
||||||
return new ProxyItemWrapper(item.getUri(), item.getLabel(),
|
return new ProxyItemWrapper(item.getUri(), item.getLabel(),
|
||||||
item.getClassLabel(), UrlBuilder.getUrl(imagePath));
|
item.getClassLabel(), UrlBuilder.getUrl(imagePath), profileUri);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ProxyItemInfo wrapProfileItem(ProxyItemInfo item) {
|
private ProxyItemInfo wrapProfileItem(ProxyItemInfo item) {
|
||||||
|
@ -185,10 +194,24 @@ public class ManageProxiesListPage extends AbstractPageHandler {
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ProxyItemWrapper extends ProxyItemInfo {
|
public static class ProxyItemWrapper extends ProxyItemInfo {
|
||||||
|
private final String profileUri;
|
||||||
|
|
||||||
public ProxyItemWrapper(String uri, String label, String classLabel,
|
public ProxyItemWrapper(String uri, String label, String classLabel,
|
||||||
String imageUrl) {
|
String imageUrl, String profileUri) {
|
||||||
super(uri, label, classLabel, imageUrl);
|
super(uri, label, classLabel, imageUrl);
|
||||||
|
this.profileUri = profileUri;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getProfileUri() {
|
||||||
|
return profileUri;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "ProxyItemWrapper[uri=" + getUri() + ", label=" + getLabel()
|
||||||
|
+ ", classLabel=" + getClassLabel() + ", imageUrl="
|
||||||
|
+ getImageUrl() + ", profileUri=" + profileUri + "]";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue