Merge branch 'dev' into f-edit-panel

CHANGELOG.md

@@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   modal and an SSS submission button, respectively.
 * Allow to supply a function that creates the form instead of a config to
   create_show_form_callback
+* `BUILD_MODULE_EXT_ENTITY_ACL_USER_MANAGEMENT_BUTTON` build variable with which
+  a button to the user management is added to the navbar for users with role
+  administration if `BUILD_MODULE_EXT_ENTITY_ACL=ENABLED`.
+
 ### Changed (for changes in existing functionality)
 
 ### Deprecated

src/core/js/ext_entity_acl.js

@@ -32,10 +32,15 @@
  *
  *   BUILD_MODULE_EXT_ENTITY_ACL_URI_ROOT=[scheme://host:port]/what/evs
  *
+ * Enable/disable the creation of a user-management link that is shown to
+ * administrators with
+ *
+ *   BUILD_MODULE_EXT_ENTITY_ACL_USER_MANAGEMENT_BUTTON=ENABLED
+ *
  *
  * @author Timm Fitschen
  */
-var ext_entity_acl = function ($, connection, getEntityVersion, getEntityID, logger) {
+var ext_entity_acl = function ($, connection, getEntityVersion, getEntityID, logger, navbar, userIsAdministrator) {
 
     const BUILD_MODULE_EXT_ENTITY_ACL_URI_ROOT = connection.getBasePath() + "webinterface/acm/entityacl/";
     const _buttons_list_class = "caosdb-v-entity-header-buttons-list";
@@ -69,6 +74,14 @@ var ext_entity_acl = function ($, connection, getEntityVersion, getEntityID, log
         $(entity).find(`.${_buttons_list_class} .${_entity_acl_link_class}`).remove();
     }
 
+    var showUserManagementLink = function () {
+        if (userIsAdministrator()) {
+            navbar.add_button($('<a class="nav-link" href="/webinterface/acm/">User Administration</a>')[0], {
+                title: "Go to user administration"
+            });
+        }
+    }
+
     var _init = function () {
         for (let entity of $(".caosdb-entity-panel")) {
             remove_entity_acl_link(entity);
@@ -82,6 +95,10 @@ var ext_entity_acl = function ($, connection, getEntityVersion, getEntityID, log
      * Removes all respective buttons if present before adding a new one.
      */
     var init = function () {
+        if ("${BUILD_MODULE_EXT_ENTITY_ACL_USER_MANAGEMENT_BUTTON}" == "ENABLED") {
+            showUserManagementLink();
+        }
+
         _init();
 
         // edit-mode-listener
@@ -95,7 +112,7 @@ var ext_entity_acl = function ($, connection, getEntityVersion, getEntityID, log
         init: init
     };
 
-}($, connection, getEntityVersion, getEntityID, log.getLogger("ext_entity_acl"));
+}($, connection, getEntityVersion, getEntityID, log.getLogger("ext_entity_acl"), navbar, userIsAdministrator);
 
 $(document).ready(function () {
     if ("${BUILD_MODULE_EXT_ENTITY_ACL}" == "ENABLED") {