apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8457: SAML UI Dialog fixes to use local $form

Browse Source 
This uses local selector to access the DOM elements, the previous commit
would find a global element which is not in the context and fail changing the
element in the opened dialog.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #583
This commit is contained in:
Rohit Yadav 2015-07-14 11:31:27 +05:30
parent ca68bb0ef7
commit 47d2d07eb9
3 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/accounts.js
View File

@ -1099,21 +1099,21 @@
}, },
select: function(args) { select: function(args) {
var samlChecked = false; var samlChecked = false;
var idpUrl = ""; var idpUrl = args.$form.find('select[name=samlEntity]').children(':selected').val();
var appendDomainToUsername = function() { var appendDomainToUsername = function() {
if (!g_appendIdpDomain) { if (!g_appendIdpDomain) {
return; return;
} }
var username = $('input[name=username]').val(); var username = args.$form.find('input[name=username]').val();
if (username) { if (username) {
username = username.split('@')[0]; username = username.split('@')[0];
} }
if (samlChecked) { if (samlChecked) {
var link = document.createElement('a'); var link = document.createElement('a');
link.setAttribute('href', idpUrl); link.setAttribute('href', idpUrl);
$('input[name=username]').val(username + "@" + link.host.split('.').splice(-2).join('.')); args.$form.find('input[name=username]').val(username + "@" + link.host.split('.').splice(-2).join('.'));
} else { } else {
$('input[name=username]').val(username); args.$form.find('input[name=username]').val(username);
} }
}; };
args.$form.find('select[name=samlEntity]').change(function() { args.$form.find('select[name=samlEntity]').change(function() {

27
ui/scripts/accountsWizard.js
View File

@ -179,33 +179,6 @@
required: false required: false
}, },
select: function(args) { select: function(args) {
var samlChecked = false;
var idpUrl = "";
var appendDomainToUsername = function() {
if (!g_appendIdpDomain) {
return;
}
var username = $('input[name=username]').val();
if (username) {
username = username.split('@')[0];
}
if (samlChecked) {
var link = document.createElement('a');
link.setAttribute('href', idpUrl);
$('input[name=username]').val(username + "@" + link.host.split('.').splice(-2).join('.'));
} else {
$('input[name=username]').val(username);
}
};
args.$form.find('select[name=samlEntity]').change(function() {
idpUrl = $(this).children(':selected').val();
appendDomainToUsername();
});
args.$form.find('input[name=samlEnable]').change(function() {
samlChecked = $(this).context.checked;
appendDomainToUsername();
});
var items = []; var items = [];
$(g_idpList).each(function() { $(g_idpList).each(function() {
items.push({ items.push({

29
ui/scripts/ui-custom/accountsWizard.js
View File

@ -293,6 +293,35 @@
} }
$wizard.find('.manual-account-details').append(informationNotInLdapForm); $wizard.find('.manual-account-details').append(informationNotInLdapForm);
if (g_idpList && g_appendIdpDomain && !ldapStatus) {
var samlChecked = false;
var idpUrl = $wizard.find('select[name=samlEntity]').children(':selected').val();
var appendDomainToUsername = function() {
if (!g_appendIdpDomain) {
return;
}
var username = $wizard.find('input[name=username]').val();
if (username) {
username = username.split('@')[0];
}
if (samlChecked) {
var link = document.createElement('a');
link.setAttribute('href', idpUrl);
$wizard.find('input[name=username]').val(username + "@" + link.host.split('.').splice(-2).join('.'));
} else {
$wizard.find('input[name=username]').val(username);
}
};
$wizard.find('select[name=samlEntity]').change(function() {
idpUrl = $(this).children(':selected').val();
appendDomainToUsername();
});
$wizard.find('input[name=samlEnable]').change(function() {
samlChecked = $(this).context.checked;
appendDomainToUsername();
});
}
return $wizard.dialog({ return $wizard.dialog({
title: ldapStatus ? _l('Add LDAP Account') : _l('label.add.account'), title: ldapStatus ? _l('Add LDAP Account') : _l('label.add.account'),
width: ldapStatus ? 800 : 330, width: ldapStatus ? 800 : 330,