Merge branch 'fix-grop-select-load' into 'master'

fix(admin): groups select refresh at each modal open

See merge request isard/isard-sso!81
Josep Maria Viñolas Auquer 2022-05-28 17:17:42 +00:00
commit 6a4f8cc3f9
1 changed files with 32 additions and 27 deletions

View File

@ -5,32 +5,7 @@ $(document).on('shown.bs.modal', '#modalAddDesktop', function () {
$(document).ready(function() {
$.ajax({
type: "GET",
"url": "/api/groups",
success: function(data)
{
$(".groups-select").append(
'<option value="" default>None</option>'
)
data.forEach(element => {
var groupOrigins = [];
['keycloak'].forEach(o => {
if (element[o]) {
groupOrigins.push(o)
}
})
$(".groups-select").append(
'<option value="' + element.name + '">' + element.name + '</option>'
)
});
$('.groups-select').select2();
},
error: function(data)
{
alert('Something went wrong on our side...')
}
});
update_modal_groups();
$('.btn-global-resync').on('click', function () {
$.ajax({
@ -52,6 +27,7 @@ $(document).ready(function() {
// Open new group modal
$('.btn-new').on('click', function () {
update_modal_groups()
$('#modalAddGroup').modal({
backdrop: 'static',
keyboard: false
@ -220,4 +196,33 @@ $(document).ready(function() {
break;
}
});
})
})
function update_modal_groups(){
$.ajax({
type: "GET",
"url": "/api/groups",
success: function(data)
{
$(".groups-select").empty().append(
'<option value="" default>None</option>'
)
data.forEach(element => {
var groupOrigins = [];
['keycloak'].forEach(o => {
if (element[o]) {
groupOrigins.push(o)
}
})
$(".groups-select").append(
'<option value="' + element.name + '">' + element.name + '</option>'
)
});
$('.groups-select').select2();
},
error: function(data)
{
alert('Something went wrong on our side...')
}
});
}