Merge branch 'main' into develop

templates/element/genericElements/IndexTable/Fields/org.php

@@ -18,13 +18,13 @@
                 if ($field['fields']['allow_picture'] && !empty($org['id'])) {
                     echo sprintf(
                         '<a href="%s">%s</a>',
-                        $baseurl . 'organisations/view/' . h($org['id']),
+                        $baseurl . '/organisations/view/' . h($org['id']),
                         h($org['name'])
                     );
                     //echo $this->OrgImg->getOrgImg(array('name' => $org['name'], 'id' => $org['id'], 'size' => 24));
                 } else {
                     echo sprintf(
-                        '<a href="%sorganisations/view/%s">%s</a>',
+                        '<a href="%s/organisations/view/%s">%s</a>',
                         $baseurl,
                         empty($org['id']) ? h($org['uuid']) : h($org['id']),
                         h($org['name'])