litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source 
Conflicts:
	src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
This commit is contained in:
hudajkhan 2013-11-01 11:29:29 -04:00
commit b71fb8045a
6 changed files with 71 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
View file

@ -122,8 +122,11 @@ public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPrope
}
String[] typesArray = types.toArray(new String[types.size()]);
field.setOptions( new IndividualsViaSolrQueryOptions(
vreq.getSession().getServletContext(),
typesArray));
vreq.getSession().getServletContext(),
getSubjectUri(),
predicateUri,
getObjectUri(),
typesArray));
}else{
field.setOptions(null);
}