EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed select groups on edit

Melina Gamboa 2021-06-08 18:54:10 +02:00 committed by root
parent ec23d2ecb7
commit 90d78d81db
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
admin/src/admin/static/js/users.js
View File

@ -18,7 +18,7 @@ $(document).ready(function() {
} }
}) })
$(".groups-select").append( $(".groups-select").append(
'<option value=' + element.path + '>' + element.name + '</option>' '<option value="' + element.path + '">' + element.path + '</option>'
) )
}); });
$('.groups-select').select2(); $('.groups-select').select2();
@ -60,7 +60,7 @@ $(document).ready(function() {
{ {
data.forEach(element => { data.forEach(element => {
$(".role-moodle-select, .role-nextcloud-select, .role-keycloak-select").append( $(".role-moodle-select, .role-nextcloud-select, .role-keycloak-select").append(
'<option value=' + element.id + '>' + element.name + '</option>' '<option value="' + element.name + '">' + element.name + '</option>'
) )
}) })
}, },
@ -144,8 +144,8 @@ $(document).ready(function() {
"data": null, "data": null,
"width": "80px", "width": "80px",
"defaultContent": '<button id="btn-delete" class="btn btn-xs" type="button" data-placement="top" ><i class="fa fa-times" style="color:darkred"></i></button> \ "defaultContent": '<button id="btn-delete" class="btn btn-xs" type="button" data-placement="top" ><i class="fa fa-times" style="color:darkred"></i></button> \
<button id="btn-password" class="btn btn-xs" type="button" data-placement="top" ><i class="fa fa-lock" style="color:orange"></i></button>' <button id="btn-password" class="btn btn-xs" type="button" data-placement="top" ><i class="fa fa-lock" style="color:orange"></i></button> \
// '<button id="btn-edit" class="btn btn-xs" type="button" data-placement="top" ><i class="fa fa-pencil" style="color:darkblue"></i></button> \ <button id="btn-edit" class="btn btn-xs" type="button" data-placement="top" ><i class="fa fa-pencil" style="color:darkblue"></i></button>'
}, },
{ "data": "first", "width": "10px"}, { "data": "first", "width": "10px"},
{ "data": "last", "width": "150px"}, { "data": "last", "width": "150px"},
@ -320,6 +320,17 @@ $(document).ready(function() {
} }
}); });
$("#modalEditUser #send").on('click', function(e){
var form = $('#modalEditUserForm');
form.parsley().validate();
if (form.parsley().isValid()){
data=$('#modalEditUserForm').serializeObject();
data['id']=$('#modalEditUserForm #id').val();
console.log('Editing user...')
console.log(data)
}
});
function addUserDetailPannel ( d ) { function addUserDetailPannel ( d ) {
$newPanel = $template.clone(); $newPanel = $template.clone();
$newPanel.html(function(i, oldHtml){ $newPanel.html(function(i, oldHtml){
@ -355,17 +366,6 @@ $(document).ready(function() {
// $('#modalEdit').parsley(); // $('#modalEdit').parsley();
// }); // });
$("#modalEditUser #send").on('click', function(e){
var form = $('#modalEditUserForm');
form.parsley().validate();
if (form.parsley().isValid()){
data=$('#modalEditUserForm').serializeObject();
data['id']=$('#modalEditUserForm #id').val();
console.log('Editing user...')
console.log(data)
}
});
// $('.btn-delete').on('click', function () { // $('.btn-delete').on('click', function () {
// var closest=$(this).closest("div").parent(); // var closest=$(this).closest("div").parent();
// var pk=closest.attr("data-pk"); // var pk=closest.attr("data-pk");
@ -399,17 +399,19 @@ $(document).ready(function() {
url:"/api/user/" + user_id, url:"/api/user/" + user_id,
success: function(data) success: function(data)
{ {
if (data.enabled) {
$(div_id + ' #enabled').iCheck('check')
}
$(div_id + ' #id').val(data.id); $(div_id + ' #id').val(data.id);
$(div_id + ' #username').val(data.username); $(div_id + ' #username').val(data.username);
$(div_id + ' #email').val(data.email); $(div_id + ' #email').val(data.email);
$(div_id + ' #firstname').val(data.first); $(div_id + ' #firstname').val(data.first);
$(div_id + ' #lastname').val(data.last); $(div_id + ' #lastname').val(data.last);
console.log(data.keycloak_groups)
$(div_id + ' .groups-select').val(data.keycloak_groups); $(div_id + ' .groups-select').val(data.keycloak_groups);
// $(div_id + ' .role-moodle-select').val(data.keycloak_roles); // $(div_id + ' .role-moodle-select').val(data.keycloak_roles);
// $(div_id + ' .role-nextcloud-select').val(data.roles); // $(div_id + ' .role-nextcloud-select').val(data.roles);
$(div_id + ' .role-keycloak-select').val(data.keycloak_roles); $(div_id + ' .role-keycloak-select').val(data.roles[0]);
$('.groups-select, .role-keycloak-select').trigger('change'); $('.groups-select').trigger('change');
// $('.groups-select, .role-moodle-select, .role-nextcloud-select, .role-keycloak-select').trigger('change'); // $('.groups-select, .role-moodle-select, .role-nextcloud-select, .role-keycloak-select').trigger('change');
} }
}); });

9
admin/src/admin/static/templates/pages/modals/users_modals.html
View File

@ -189,7 +189,7 @@
<div class="checkbox"> <div class="checkbox">
<label class=""> <label class="">
<div class="icheckbox_flat-green" style="position: relative;"> <div class="icheckbox_flat-green" style="position: relative;">
<input type="checkbox" id="jumperurl-check" name="jumperurl-check" class="flat" style="position: absolute; opacity: 0;"> <input type="checkbox" id="enabled" name="enabled" class="flat" style="position: absolute; opacity: 0;">
<ins class="iCheck-helper" style="position: absolute; top: 0%; left: 0%; display: block; width: 100%; height: 100%; margin: 0px; padding: 0px; background: rgb(255, 255, 255); border: 0px; opacity: 0;"> <ins class="iCheck-helper" style="position: absolute; top: 0%; left: 0%; display: block; width: 100%; height: 100%; margin: 0px; padding: 0px; background: rgb(255, 255, 255); border: 0px; opacity: 0;">
</ins> </ins>
</div> </div>
@ -203,6 +203,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="x_content" style="padding: 0px;"> <div class="x_content" style="padding: 0px;">
<input id="id" hidden/>
<div class="row"> <div class="row">
<div class="col-md-2 col-sm-2 col-xs-12 text-center"> <div class="col-md-2 col-sm-2 col-xs-12 text-center">
<img id="user-avatar" src="" width="100" height="100"/> <img id="user-avatar" src="" width="100" height="100"/>
@ -213,7 +214,7 @@
<div class="col-md-6 col-xs-12"> <div class="col-md-6 col-xs-12">
<label class="control-label" for="name">Username <span class="required">*</span> <label class="control-label" for="name">Username <span class="required">*</span>
</label> </label>
<input id="username" class="roundbox" maxlength="40" pattern="^[-_àèìòùáéíóúñçÀÈÌÒÙÁÉÍÓÚÑÇ .a-zA-Z0-9]+$" data-parsley-length="[4, 40]" name="name" placeholder="Username" data-parsley-trigger="change" required type="text" style="width:100%"> <input disabled id="username" class="roundbox" maxlength="40" pattern="^[-_àèìòùáéíóúñçÀÈÌÒÙÁÉÍÓÚÑÇ .a-zA-Z0-9]+$" data-parsley-length="[4, 40]" name="name" placeholder="Username" data-parsley-trigger="change" required type="text" style="width:100%">
</div> </div>
<div class="col-md-6 col-xs-12"> <div class="col-md-6 col-xs-12">
<label class="control-label" for="email">Email <span class="required">*</span> <label class="control-label" for="email">Email <span class="required">*</span>
@ -262,9 +263,9 @@
<select class="role-nextcloud-select" name="nextcloud" style="width:100%"> <select class="role-nextcloud-select" name="nextcloud" style="width:100%">
</select> </select>
</div> --> </div> -->
<div class="col-md-4 col-xs-12"> <div class="col-md-12 col-xs-12">
<label class="control-label" for="id">Role</label> <label class="control-label" for="id">Role</label>
<select class="role-keycloak-select" name="keycloak" style="width:100%"> <select class="role-keycloak-select roundbox" name="role-keycloak" style="width:100%">
</select> </select>
</div> </div>
</div> </div>