diff --git a/admin/src/admin/__init__.py b/admin/src/admin/__init__.py index ba83bdb..3b22800 100644 --- a/admin/src/admin/__init__.py +++ b/admin/src/admin/__init__.py @@ -63,6 +63,10 @@ def send_templates(path): def send_static_js(path): return send_from_directory(os.path.join(app.root_path, 'static'), path) +@app.route('/isard-sso-admin/avatars/') +def send_avatars_img(path): + return send_from_directory(os.path.join(app.root_path, '../avatars/master-avatars'), path) + # @app.errorhandler(404) # def not_found_error(error): # return render_template('page_404.html'), 404 diff --git a/admin/src/admin/lib/admin.py b/admin/src/admin/lib/admin.py index 5acf5d1..a5d8772 100644 --- a/admin/src/admin/lib/admin.py +++ b/admin/src/admin/lib/admin.py @@ -147,7 +147,7 @@ class Admin(): return True def get_moodle_users(self): - return self.moodle.get_users_with_groups_and_roles() + return [u for u in self.moodle.get_users_with_groups_and_roles() if u['username'] not in ['guest','ddadmin','admin'] and not u['username'].startswith('system')] ## TOO SLOW. Not used. # def get_moodle_users(self): @@ -173,7 +173,7 @@ class Admin(): "email": u.get('email',''), "groups": u['group'], "roles": filter_roles_list(u['role'])} - for u in users] + for u in users if u['username'] not in ['guest','ddadmin','admin'] and not u['username'].startswith('system')] def get_nextcloud_users(self): return [{"id":u['username'], @@ -183,7 +183,7 @@ class Admin(): "email": u.get('email',''), "groups": u['groups'], "roles": False} - for u in self.nextcloud.get_users_list()] + for u in self.nextcloud.get_users_list() if u['username'] not in ['guest','ddadmin','admin'] and not u['username'].startswith('system')] ## TOO SLOW # def get_nextcloud_users(self): diff --git a/admin/src/admin/static/js/users.js b/admin/src/admin/static/js/users.js index e7a1404..53c6226 100644 --- a/admin/src/admin/static/js/users.js +++ b/admin/src/admin/static/js/users.js @@ -183,6 +183,11 @@ $(document).ready(function() { ], "order": [[4, 'asc']], "columnDefs": [ { + "targets": 1, + "render": function ( data, type, full, meta ) { + return 'X' + }}, + { "targets": 2, "render": function ( data, type, full, meta ) { if(full.keycloak){ diff --git a/admin/src/admin/static/templates/pages/users.html b/admin/src/admin/static/templates/pages/users.html index b2de05e..59a5762 100644 --- a/admin/src/admin/static/templates/pages/users.html +++ b/admin/src/admin/static/templates/pages/users.html @@ -34,7 +34,7 @@ - Id + Avatar Keycloak K.Groups K.Roles diff --git a/admin/src/moodle_saml.py b/admin/src/moodle_saml.py index 141aef8..af08cb0 100644 --- a/admin/src/moodle_saml.py +++ b/admin/src/moodle_saml.py @@ -131,7 +131,7 @@ class MoodleSaml(): def set_moodle_saml_plugin(self): config={'idpmetadata': self.parse_idp_metadata(), 'certs_locked': '1', - 'duallogin': '0', + 'duallogin': '1', 'idpattr': 'username', 'autocreate': '1', 'saml_role_siteadmin_map': 'admin', diff --git a/docker/api/src/api/lib/menu.py b/docker/api/src/api/lib/menu.py index c1aa10b..4724184 100644 --- a/docker/api/src/api/lib/menu.py +++ b/docker/api/src/api/lib/menu.py @@ -63,3 +63,11 @@ class Menu(): return self.menudict # with open('menu.yaml', 'w') as yml: # print(yaml.dump(header, yml, allow_unicode=True)) + + def parse_css_color(self): + pass + #Replace colors in dd.css based on system.yml: + # colours: + # background: "#F0F0F0" + # primary: "#92AE01" + # secondary: "#FFFFFF" \ No newline at end of file