lib/php/db/table.php

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 8659bb32052bc1616a395a3257054605862c73f8..25cc97cd00b1393e6a35836fbbe94cb380d47efc 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -750,7 +750,8 @@ Class Table extends nb {
                $num_start = $tot ? ($x+1) : 0;
                $num_end = $tot<($x+$y) ? $tot : ($x+$y);
 # NB 01.10.18          $html .= '<span class="count page-item"><span class="page-link">'.$page.' / '.$pages.'</span></span>';
-               $html .= '<span class="count page-item"><span class="page-link">'.$num_start.' - '.$num_end.' / '.$tot.$page.'</span></span>';
+# NB 18.03.19          $html .= '<span class="count page-item"><span class="page-link">'."$num_start - $num_end / $tot ($page)</span></span>";
+               $html .= '<span class="count page-item"><span class="page-link">'."$page / $pages | $tot</span></span>";
 
                if ($next<$tot) {
                        $html .= '<span class="next page-item"><a class="page-link" href="'.$this->url_list('limit',"$next,$y").'">&gt;</a></span>';

diff --git a/lib/postgres/host.sql b/lib/postgres/host.sql
index 65e5323ff4c3e8209e2bba4dbbedd475f53457ac..dbb2285e9b9705ccb8e5287fccb1302787b77c2e 100644 (file)
--- a/lib/postgres/host.sql
+++ b/lib/postgres/host.sql
@@ -3,6 +3,7 @@ CREATE VIEW host AS
        SELECT host
                ,LEFT(CAST(MAX(updated) AS TEXT),19) as updated
                ,count(*) as infos
+               ,array_to_string(array_agg(DISTINCT CASE WHEN key LIKE 'git.%.name' THEN val ELSE null END),' ') as installed
                ,array_to_string(array_agg(DISTINCT CASE WHEN key LIKE 'git.%.branch' THEN val ELSE null END),' ') as branches
        FROM host_info
        GROUP BY host