Changed the organisation navigation menu slightly to better handle single organisation mode

locale/en_US/messages.php

@@ -54,7 +54,10 @@ return [
         'MEMBER_COUNT'                   => '# Members <sub>(excl admins)</sub>',
         'ADMIN_COUNT'                    => '# Admins',
 
-        'SELF'                           => 'My Organisations',
+        'SELF'                           => [
+            1 => 'My Organisation',
+            2 => 'My Organisations',
+        ],
         'MANAGE'                         => 'Manage Organisations',
         'ASSIGN_NEW'                     => 'Assign to organisation',
 

templates/navigation/sidebar-menu.html.twig

@@ -1,14 +1,13 @@
 {% extends "@admin/navigation/sidebar-menu.html.twig" %}
 
-{% block navigation %}
+{% block organisations_nav %}
-    {{ parent() }}
-
     {% if checkAccess('uri_organisations') %}
     <li>
         <a href="{{site.uri.public}}/organisations"><i class="fas fa-sitemap fa-fw"></i> <span>{{ translate("ORGANISATION", 2) }}</span></a>
     </li>
     {% endif %}
     {% if current_user.organisations.count() > 0 %}
+        {% if organisationConfig.membership.single_membership == false %}
             <li>
                 <a href="#" data-toggle="collapse" data-target="#submenu-organisations" aria-expanded="false"><i class="fa fa-fw fa-sitemap"></i> <span>{{ translate("ORGANISATION.SELF") }}</span> <i class="fa fa-fw pull-right fa-angle-down"></i></a>
                 <ul id="submenu-organisations" class="collapsable collapse" aria-expanded="false" style="height: 1px;">
@@ -21,5 +20,18 @@
                 {% endfor %}
                 </ul>
             </li>
+        {% else %}
+            {% set organisation = current_user.organisations.0 %}
+            {% if organisation.flag_approved or isOrganisationRegistrant(organisation) %}
+            <li>
+                <a href="{{site.uri.public}}/organisations/o/{{organisation.slug}}"><i class="fas fa-sitemap fa-fw"></i> <span>{{ translate("ORGANISATION.SELF") }}</span></a>
+            </li>
+            {% endif %}
+        {% endif %}
     {% endif %}
 {% endblock %}
+
+{% block navigation %}
+    {{ parent() }}
+    {{ block('organisations_nav') }}
+{% endblock %}