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

NIHVIVO-2854 InternetExplorer interprets "function" as a reserved word. Changed to "action".

Browse source
This commit is contained in:
j2blake 2011-07-08 19:47:57 +00:00
parent 1dcbe8491f
commit 94ae938900
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java
View file

@ -26,7 +26,7 @@ public class UserAccountsAjaxController extends VitroAjaxController {
private static final Log log = LogFactory private static final Log log = LogFactory
.getLog(UserAccountsAjaxController.class); .getLog(UserAccountsAjaxController.class);
private static final String PARAMETER_FUNCTION = "function"; private static final String PARAMETER_ACTION = "action";
@Override @Override
protected Actions requiredActions(VitroRequest vreq) { protected Actions requiredActions(VitroRequest vreq) {
@ -37,7 +37,7 @@ public class UserAccountsAjaxController extends VitroAjaxController {
protected void doRequest(VitroRequest vreq, HttpServletResponse resp) protected void doRequest(VitroRequest vreq, HttpServletResponse resp)
throws ServletException, IOException { throws ServletException, IOException {
try { try {
String function = vreq.getParameter(PARAMETER_FUNCTION); String function = vreq.getParameter(PARAMETER_ACTION);
if ("checkExternalAuth".equals(function)) { if ("checkExternalAuth".equals(function)) {
new ExternalAuthChecker(this, vreq, resp).processRequest(); new ExternalAuthChecker(this, vreq, resp).processRequest();
} else if ("autoCompleteProfile".equals(function)) { } else if ("autoCompleteProfile".equals(function)) {

4
webapp/web/js/account/accountAssociateProfile.js
View file

@ -92,7 +92,7 @@ var associateProfileFields = {
url: associateProfileFields.ajaxUrl, url: associateProfileFields.ajaxUrl,
dataType: 'json', dataType: 'json',
data: { data: {
function: "autoCompleteProfile", action: "autoCompleteProfile",
term: request.term, term: request.term,
externalAuthId: associateProfileFields.externalAuthIdField.val() externalAuthId: associateProfileFields.externalAuthIdField.val()
}, },
@ -115,7 +115,7 @@ var associateProfileFields = {
url: associateProfileFields.ajaxUrl, url: associateProfileFields.ajaxUrl,
dataType: "json", dataType: "json",
data: { data: {
function: "checkExternalAuth", action: "checkExternalAuth",
userAccountUri: associateProfileFields.userUri, userAccountUri: associateProfileFields.userUri,
externalAuthId: associateProfileFields.externalAuthIdField.val() externalAuthId: associateProfileFields.externalAuthIdField.val()
}, },