feat(ui): improve count of items in tabs (#52)

flyve-mdm · Jun 9, 2017 · ba9bbd0 · ba9bbd0
1 parent 1f087c7
commit ba9bbd0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -124,15 +124,15 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) {
                if (!$withtemplate) {
                   $nb = 0;
                   $fleetId = $item->getID();
+                  $pluralNumber = Session::getPluralNumber();
                   if ($_SESSION['glpishow_count_on_tabs']) {
                      if (version_compare(GLPI_VERSION, '9.2') < 0) {
-
                         $nb = countElementsInTable(static::getTable(), "`plugin_flyvemdm_fleets_id` = '$fleetId'");
                      } else {
                         $nb = countElementsInTable(static::getTable(), ['plugin_flyvemdm_fleets_id' => $fleetId]);
                      }
                   }
-                  return self::createTabEntry(self::getTypeName(1), $nb);
+                  return self::createTabEntry(self::getTypeName($pluralNumber), $nb);
                }
                break;
          }

diff --git a/inc/fleet_policy.class.php b/inc/fleet_policy.class.php
@@ -79,8 +79,17 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
       if (static::canView()) {
          switch ($item->getType()) {
             case PluginFlyvemdmFleet::class:
-               $tab = array(1 => __('Policies'));
-               return $tab;
+               if ($_SESSION['glpishow_count_on_tabs']) {
+                  $nb = 0;
+                  $fleetId = $item->getID();
+                  $pluralNumber = Session::getPluralNumber();
+                  if (version_compare(GLPI_VERSION, '9.2') < 0) {
+                     $nb = countElementsInTable(static::getTable(), "`plugin_flyvemdm_fleets_id` = '$fleetId'");
+                  } else {
+                     $nb = countElementsInTable(static::getTable(), ['plugin_flyvemdm_fleets_id' => $fleetId]);
+                  }
+               }
+               return self::createTabEntry(PluginFlyvemdmPolicy::getTypeName($pluralNumber), $nb);
          }
       }
    }