composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/2.7' into support/3.0

Browse Source 
# 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
parent 4d365c8a44 9077f7ba37
commit 9474f43d61
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-oauth-client/assets/js/oauth_connect.js
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; sOAuthAjaxURI = sAjaxUri;
sOAuthObjClass = sClass; sOAuthObjClass = sClass;
sOAuthObjKey = sId; sOAuthObjKey = sId;
sOAuthReturnURI = sReturnUri;
$.post( $.post(
sOAuthAjaxURI, sOAuthAjaxURI,