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

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6

Browse source
This commit is contained in:
brianjlowe 2013-11-05 15:25:32 -05:00
commit d52ce0aad8
2 changed files with 902 additions and 898 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
View file

@ -271,7 +271,8 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
urisInScope.put("roleType",
Arrays.asList(new String[]{getRoleType(vreq)}));
//Setting inverse role predicate
urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
// with ISF changes this will always be the same
urisInScope.put("inverseRolePredicate", Arrays.asList(new String[]{"http://purl.obolibrary.org/obo/RO_0000052"}));
editConfiguration.setUrisInScope(urisInScope);
//Uris in scope include subject, predicate, and object var

5
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
View file

@ -3,6 +3,8 @@
package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -268,7 +270,8 @@ public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigura
HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
//Setting inverse role predicate
urisInScope.put("inverseRolePredicate", getInversePredicate(vreq));
//With ISF changes this will always be the same
urisInScope.put("inverseRolePredicate", Arrays.asList(new String[]{"http://purl.obolibrary.org/obo/RO_0000052"}));
urisInScope.put("roleType", list( getRoleType() ) );
//Uris in scope include subject, predicate, and object var