From a5ea84b4fe37fc42d67145fa68e48ecdf6faf9b1 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Mon, 26 Jul 2010 18:47:44 +0000 Subject: [PATCH] Merge r1177 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint --- productMods/edit/forms/addGrantRoleToPerson.jsp | 3 ++- productMods/edit/forms/addRoleToPersonTwoStage.jsp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp index 7d6298d1..1da850bc 100644 --- a/productMods/edit/forms/addGrantRoleToPerson.jsp +++ b/productMods/edit/forms/addGrantRoleToPerson.jsp @@ -253,8 +253,9 @@ PREFIX core: <${vivoCore}> // Return browser to person individual after editing an existing role. } else { 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. - editConfig.setEntityToReturnTo("?grant"); + // editConfig.setEntityToReturnTo("?grant"); } String subjectUri = vreq.getParameter("subjectUri"); diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index d8032647..28f31a7e 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -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. } else { 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. - editConfig.setEntityToReturnTo("?roleActivity"); + // editConfig.setEntityToReturnTo("?roleActivity"); } List customJs = new ArrayList(Arrays.asList(JavaScript.JQUERY_UI.path(),