table delete button

diff --git a/etc/dbs/ui.php b/etc/dbs/ui.php
index 26b0426b1f698489a1bd8d433f9a57276173253a..644d9369be4c556c4d8043689328677fdf7d78d4 100644 (file)
--- a/etc/dbs/ui.php
+++ b/etc/dbs/ui.php
@@ -100,12 +100,12 @@ $CONF['_ui'] = array(
           #"SELECT * FROM (SELECT 'dell-drac' as 'n',replace(src,'.semantico.net','') as 'v' FROM dns WHERE src LIKE ".$Db->quote($r['id'].'-rac.%')." ORDER BY length(v) LIMIT 1) drac"
           ""
           ."SELECT 'idvmware',idvmware FROM vms WHERE vms.idnode=".$Db->quote($r['id'])
-          ."UNION SELECT 'env',value FROM fact WHERE name = 'environment' AND idnode=".$Db->quote($r['id'])
-          ."UNION SELECT 'aws_ec2',id FROM aws_ec2 WHERE aws_ec2.idnode=".$Db->quote($r['id'])
-          ."UNION SELECT 'last_backup',CONCAT('<a href=\"#\" onclick=\"alert(''Directories:\\n\\n ',replace(dirs,' ','\\n'),''');return false\">',max(date),'</a>') as 'v' FROM backup WHERE idnode=".$Db->quote($r['id'])
-          ."UNION SELECT 'last_run',substr(value,1,10) FROM fact WHERE name = 'last_run' AND idnode=".$Db->quote($r['id'])." AND value < ".$Db->quote(date('Y-m-d', strtotime('-3 days')))
-          ."UNION SELECT 'rack',CONCAT(idrack,'/',position) FROM rack_node WHERE idnode=".$Db->quote($r['id'])." OR idnode IN (SELECT idvmware FROM vms WHERE vms.idnode=rack_node.idnode)"
-          ."UNION SELECT 'switch' as 'n', CONCAT(id,':',port) as 'v' FROM switch_port WHERE switch_port.idnode=".$Db->quote($r['id'])." AND switch_port.port NOT LIKE 'ch%'"
+          ." UNION SELECT 'env',value FROM fact WHERE name = 'environment' AND idnode=".$Db->quote($r['id'])
+          ." UNION SELECT 'aws_ec2',id FROM aws_ec2 WHERE aws_ec2.idnode=".$Db->quote($r['id'])
+          ." UNION SELECT 'last_backup',CONCAT('<a href=\"#\" onclick=\"alert(''Directories:\\n\\n ',replace(dirs,' ','\\n'),''');return false\">',max(date),'</a>') as v FROM backup WHERE idnode=".$Db->quote($r['id'])." GROUP BY dirs"
+          ." UNION SELECT 'last_run',substr(value,1,10) FROM fact WHERE name = 'last_run' AND idnode=".$Db->quote($r['id'])." AND value < ".$Db->quote(date('Y-m-d', strtotime('-3 days')))
+          ." UNION SELECT 'rack',CONCAT(idrack,'/',position) FROM rack_node WHERE idnode=".$Db->quote($r['id'])." OR idnode IN (SELECT idvmware FROM vms WHERE vms.idnode=rack_node.idnode)"
+          ." UNION SELECT 'switch' as n, CONCAT(id,':',port) as v FROM switch_port WHERE switch_port.idnode=".$Db->quote($r['id'])." AND switch_port.port NOT LIKE 'ch%'"
         ,PDO::FETCH_NUM) as $f) { $metas[$f[0]] = $f[1]; }
         if ($metas) {
           $r['metas'] = join("",array_map(function($k,$v){return (string)$v==="" ? "" : "$k=$v\n";},array_keys($metas),$metas));

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 9703537e5840f686dbb113207d38c9339c8691e4..65798414c0e64644e18043ef1100d4aad3a35daa 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -1432,7 +1432,7 @@ Class Table extends nb {
   public function html_row_buttons(&$row) {
     return array(
       '<a class="edit button" href="'.$this->url_keys($row,'action=edit').'">'.DB_HTML_EDIT.'</a>'.NB_EOL,
-      '<a class="delete button" href="'.$this->url_keys($row,'action=delete').'">'.DB_HTML_DELETE.'</a>'.NB_EOL,
+      '<a class="delete button" href="'.$this->url_keys($row,'action=delete').'&amp;referer='.urlencode($_SERVER['REQUEST_URI']).'">'.DB_HTML_DELETE.'</a>'.NB_EOL,
     );
   }
 

diff --git a/lib/postgres/functions.sql b/lib/postgres/functions.sql
index fe2044c9added0ffb9bade2c451b2b02e7e79775..6fbe904136cbb7cb86ad0dbfd7b006b580b2180e 100644 (file)
--- a/lib/postgres/functions.sql
+++ b/lib/postgres/functions.sql
@@ -6,6 +6,7 @@
 -- NB 21.06.16 );
 
 DROP AGGREGATE IF EXISTS CONCAT(text);
+/*
 CREATE AGGREGATE CONCAT(
   basetype    = text,
   sfunc       = textcat,
@@ -13,6 +14,18 @@ CREATE AGGREGATE CONCAT(
   initcond    = ''
 
 );
+*/
+
+/*
+DROP FUNCTION IF EXISTS CONCAT( VARIADIC ANYARRAY );
+CREATE FUNCTION CONCAT( VARIADIC ANYARRAY )
+RETURNS TEXT
+ LANGUAGE SQL
+  IMMUTABLE
+  AS $$
+  SELECT array_to_string($1,'');
+$$;
+*/
 
 DROP FUNCTION IF EXISTS STRFTIME(format text,sdate text);
 CREATE OR REPLACE FUNCTION STRFTIME(format text,sdate text)