From 90d78d81dbf37d312238238c8557892f11a0cd6f Mon Sep 17 00:00:00 2001
From: Melina Gamboa <melina.devel@gmail.com>
Date: Tue, 8 Jun 2021 18:54:10 +0200
Subject: [PATCH] Fixed select groups on edit

---
 admin/src/admin/static/js/users.js            | 38 ++++++++++---------
 .../templates/pages/modals/users_modals.html  |  9 +++--
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/admin/src/admin/static/js/users.js b/admin/src/admin/static/js/users.js
index c09ca77..a4ee499 100644
--- a/admin/src/admin/static/js/users.js
+++ b/admin/src/admin/static/js/users.js
@@ -18,7 +18,7 @@ $(document).ready(function() {
                     }
                 })
                 $(".groups-select").append(
-                '<option value=' + element.path + '>' + element.name + '</option>'
+                    '<option value="' + element.path + '">' + element.path + '</option>'
                 )
             });
             $('.groups-select').select2();
@@ -60,7 +60,7 @@ $(document).ready(function() {
         {
             data.forEach(element => {
                 $(".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,
                     "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> \
-                                        <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-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>'
                                     },
 				{ "data": "first", "width": "10px"},
 				{ "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 ) {
 		$newPanel = $template.clone();
 		$newPanel.html(function(i, oldHtml){
@@ -355,17 +366,6 @@ $(document).ready(function() {
         //     $('#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 () {
         //     var closest=$(this).closest("div").parent();
         //     var pk=closest.attr("data-pk");
@@ -399,17 +399,19 @@ $(document).ready(function() {
             url:"/api/user/" + user_id,
             success: function(data)
             {
+                if (data.enabled) {
+                    $(div_id + ' #enabled').iCheck('check')
+                }
                 $(div_id + ' #id').val(data.id);
                 $(div_id + ' #username').val(data.username);
                 $(div_id + ' #email').val(data.email);
                 $(div_id + ' #firstname').val(data.first);
                 $(div_id + ' #lastname').val(data.last);
-                console.log(data.keycloak_groups)
                 $(div_id + ' .groups-select').val(data.keycloak_groups);
                 // $(div_id + ' .role-moodle-select').val(data.keycloak_roles);
                 // $(div_id + ' .role-nextcloud-select').val(data.roles);
-                $(div_id + ' .role-keycloak-select').val(data.keycloak_roles);
-                $('.groups-select, .role-keycloak-select').trigger('change'); 
+                $(div_id + ' .role-keycloak-select').val(data.roles[0]);
+                $('.groups-select').trigger('change');
                 // $('.groups-select, .role-moodle-select, .role-nextcloud-select, .role-keycloak-select').trigger('change'); 
             }
         });
diff --git a/admin/src/admin/static/templates/pages/modals/users_modals.html b/admin/src/admin/static/templates/pages/modals/users_modals.html
index 3daef4d..e0e8968 100644
--- a/admin/src/admin/static/templates/pages/modals/users_modals.html
+++ b/admin/src/admin/static/templates/pages/modals/users_modals.html
@@ -189,7 +189,7 @@
                   <div class="checkbox">
                     <label class="">
                       <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>
                       </div>
@@ -203,6 +203,7 @@
               <div class="clearfix"></div>
             </div>
             <div class="x_content" style="padding: 0px;">
+              <input id="id" hidden/>
               <div class="row">
                 <div class="col-md-2 col-sm-2 col-xs-12 text-center">
                   <img id="user-avatar" src="" width="100" height="100"/>
@@ -213,7 +214,7 @@
                       <div class="col-md-6 col-xs-12">
                         <label class="control-label" for="name">Username <span class="required">*</span>
                         </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 class="col-md-6 col-xs-12">
                         <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>
                 </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>
-                  <select class="role-keycloak-select" name="keycloak" style="width:100%">
+                  <select class="role-keycloak-select roundbox" name="role-keycloak" style="width:100%">
                   </select>
                 </div>
               </div>