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

Merge r1177 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-26 18:47:44 +00:00
parent de1bc95731
commit a5ea84b4fe
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
productMods/edit/forms/addGrantRoleToPerson.jsp
View file

@ -253,8 +253,9 @@ PREFIX core: <${vivoCore}>
// Return browser to person individual after editing an existing role. // Return browser to person individual after editing an existing role.
} else { } else {
editConfig.prepareForNonUpdate(model); editConfig.prepareForNonUpdate(model);
// NIHVIVO-1014 Return browser to person individual after editing an existing role.
// Return the browser to the new activity entity after adding a new role. // Return the browser to the new activity entity after adding a new role.
editConfig.setEntityToReturnTo("?grant"); // editConfig.setEntityToReturnTo("?grant");
} }
String subjectUri = vreq.getParameter("subjectUri"); String subjectUri = vreq.getParameter("subjectUri");

3
productMods/edit/forms/addRoleToPersonTwoStage.jsp
View file

@ -352,8 +352,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
// Return browser to person individual after editing an existing role. // Return browser to person individual after editing an existing role.
} else { } else {
editConfig.prepareForNonUpdate(model); editConfig.prepareForNonUpdate(model);
// NIHVIVO-1014 Return browser to person individual after editing an existing role.
// Return the browser to the new activity entity after adding a new role. // Return the browser to the new activity entity after adding a new role.
editConfig.setEntityToReturnTo("?roleActivity"); // editConfig.setEntityToReturnTo("?roleActivity");
} }
List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(), List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(),