From: Nicolas Boisselier Date: Fri, 8 Dec 2017 07:33:06 +0000 (+0000) Subject: www/dbq/dbq.php X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=5fe1dd6151d3f63479b517c1d9ccef2bfeae8376;p=nb.git www/dbq/dbq.php --- diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php index e86007a1..8755aad1 100644 --- a/www/dbq/dbq.php +++ b/www/dbq/dbq.php @@ -79,6 +79,8 @@ class DbQ extends nb { public $table; public $db; + protected $idtemplate; + public function __construct($opt=[]) { // // Pre defaults values @@ -685,6 +687,11 @@ EOF; // Format first ! if ($this->params['format']) { $format = $this->params['format']; +# NB 08.12.17: TODO +# NB 08.12.17 if (preg_match("/^(.*)\.tmpl/",$format,$m)) { +# NB 08.12.17 $this->idtemplate = $m[1]; +# NB 08.12.17 $format = 'template'; +# NB 08.12.17 } } else if ($content_type = self::client_content_type() and ( $format=Mime::toExt($content_type) )) { #$format = $format; @@ -973,7 +980,6 @@ EOF; $this->db(true); # Db Connections $action = $this->params['table']; if (!$action and self::PARAM_DB_DEFAULT) $action = self::PARAM_DB_DEFAULT; -# NB 27.12.16 $this->params['table'] = ''; if ($action == 'help') { $this->page($this->db,[ diff --git a/www/dbq/update.sh b/www/dbq/update.sh index b2a1d1be..d3b3c8ea 100755 --- a/www/dbq/update.sh +++ b/www/dbq/update.sh @@ -16,7 +16,7 @@ for f in $(find html -type f \( -name '*.css' -o -name '*.js' \) -a -not -name ' eval minify --$ext < "$f" > "$min.bak" && mv "$min.bak" "$min" [ "$?" = "0" ] || ex=1 #git add "$min" - [ "$ex" = "0" ] && echo DEBUG: Should: git add "$min" + #[ "$ex" = "0" ] && echo DEBUG: Should: git add "$min" #[ "$ex" = "0" ] && git add "$min" && echo "DEBUG: git add $min" done