Extract the HTML from the subnav of Users page

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Feb 16, 2020 · a95d9c3 · a95d9c3
1 parent 0455dab
commit a95d9c3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 117 deletions.
diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php
@@ -103,7 +103,10 @@ public function index(): void
             && $GLOBALS['cfgRelation']['menuswork']
         ) {
             $this->response->addHTML('<div class="container-fluid">');
-            $this->response->addHTML(Users::getHtmlForSubMenusOnUsersPage(Url::getFromRoute('/server/privileges')));
+            $this->response->addHTML($this->template->render('server/privileges/subnav', [
+                'active' => 'privileges',
+                'is_super_user' => $this->dbi->isSuperuser(),
+            ]));
         }
 
         /**

diff --git a/libraries/classes/Controllers/Server/UserGroupsController.php b/libraries/classes/Controllers/Server/UserGroupsController.php
@@ -55,9 +55,10 @@ public function index(): void
         }
 
         $this->response->addHTML('<div class="container-fluid">');
-        $this->response->addHTML(Users::getHtmlForSubMenusOnUsersPage(
-            Url::getFromRoute('/server/user-groups')
-        ));
+        $this->response->addHTML($this->template->render('server/privileges/subnav', [
+            'active' => 'user-groups',
+            'is_super_user' => $this->dbi->isSuperuser(),
+        ]));
 
         /**
          * Delete user group

diff --git a/libraries/classes/Server/Users.php b/libraries/classes/Server/Users.php
diff --git a/templates/server/privileges/subnav.twig b/templates/server/privileges/subnav.twig
@@ -0,0 +1,16 @@
+<div class="row">
+  <ul class="nav nav-pills m-2">
+    <li class="nav-item">
+      <a class="nav-link{{ active == 'privileges' ? ' active' }}" href="{{ url('/server/privileges', {'viewing_mode': 'server'}) }}">
+        {% trans 'User accounts overview' %}
+      </a>
+    </li>
+    {% if is_super_user %}
+      <li class="nav-item">
+        <a class="nav-link{{ active == 'user-groups' ? ' active' }}" href="{{ url('/server/user-groups') }}">
+          {% trans 'User groups' %}
+        </a>
+      </li>
+    {% endif %}
+  </ul>
+</div>
diff --git a/test/classes/Server/UsersTest.php b/test/classes/Server/UsersTest.php