Merge branch 'support/2.7' into support/3.0

# Conflicts:
#	datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php
This commit is contained in:
Eric Espie
2022-12-02 11:20:31 +01:00

View File

@@ -77,11 +77,10 @@ const oOpenSignInWindow = function (url, name) {
};
const OAuthConnect = function(sClass, sId, sAjaxUri, sReturnUri) {
const OAuthConnect = function(sClass, sId, sAjaxUri) {
sOAuthAjaxURI = sAjaxUri;
sOAuthObjClass = sClass;
sOAuthObjKey = sId;
sOAuthReturnURI = sReturnUri;
$.post(
sOAuthAjaxURI,