From: Nicolas Boisselier <nicolas.boisselier@semantico.com>
Date: Thu, 9 Jun 2016 11:19:12 +0000 (+0100)
Subject: param options
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=71992ee4c307992c682eb19a8200b502e1ae4baf;p=nb.git

param options
---

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 35167ad5..8f40e408 100644
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -1394,74 +1394,78 @@ Class Table extends nb {
     //
     // Options
     //
-    $r .= '<div class="options">';
-
-    // Hiddens
-    $r .= self::form_hidden(array('db','table','format','limit','download'));
-    $r .= '<input type="hidden" name="download" value="0"/>'; // Embed for no html format
-
-    // Tables - see default.js if you change class
-    $r .= '<span class="label">';
-    $r .= '<label for="table">Tables</label>'.html_select_array(array_keys($this->db()->tables()),array(
-      'html'       => 'class="tables" name="table" id="table"',
-      'selected'   => $this->p('table'),
-      'prettyText' => true,
-      'sort' => 'natcasesort',
-    ));
-    $r .= '</span>';
+    if ($this->p('options')!=='0') {
+
+      $r .= '<div class="options">';
+
+      // Hiddens
+      $r .= self::form_hidden(array('db','table','format','limit','download'));
+      $r .= '<input type="hidden" name="download" value="0"/>'; // Embed for no html format
 
-    // Dbs - see default.js if you change class
-    if (!empty($this->db()->dbs) and count($this->db()->dbs)>1) {
+      // Tables - see default.js if you change class
       $r .= '<span class="label">';
-      $r .= '<label for="db">Db</label>'.html_select_array($this->db()->dbs,array(
-        'html'       => 'class="dbs" id="db" name="db" onchange="document.location=\''.preg_replace('/\?.*$/','',$_SERVER['REQUEST_URI']).'?db=\'+this.value"',
-        'selected'   => self::p('db'),
+      $r .= '<label for="table">Tables</label>'.html_select_array(array_keys($this->db()->tables()),array(
+        'html'       => 'class="tables" name="table" id="table"',
+        'selected'   => $this->p('table'),
         'prettyText' => true,
         'sort' => 'natcasesort',
       ));
       $r .= '</span>';
-    }
 
-    // Format
-    $r .= '<span class="label">';
-
-  #$criteria[] = html_select_array(ar_map('array($a == "html" ? "" : $a,strtoupper($a))',$this->formats));
-# NB 01.03.16     $r .= '<label for="format">Format</label>'.html_select_array(array(
-# NB 01.03.16       'table','div','csv','xml','json','yaml'
-    $r .= '<label for="format">Format</label>'.html_select_array($this->db()->formats,array(
-      'html'       => 'class="format" name="format" id="format"',
-      'selected'   => $this->p('format'),
-      'prettyText' => true,
-      'sort' => 'natcasesort',
-    ));
-    $r .= '</span>';
+      // Dbs - see default.js if you change class
+      if (!empty($this->db()->dbs) and count($this->db()->dbs)>1) {
+        $r .= '<span class="label">';
+        $r .= '<label for="db">Db</label>'.html_select_array($this->db()->dbs,array(
+          'html'       => 'class="dbs" id="db" name="db" onchange="document.location=\''.preg_replace('/\?.*$/','',$_SERVER['REQUEST_URI']).'?db=\'+this.value"',
+          'selected'   => self::p('db'),
+          'prettyText' => true,
+          'sort' => 'natcasesort',
+        ));
+        $r .= '</span>';
+      }
 
-    // Limit
-    if (!empty($this->db()->limits)) {
+      // Format
       $r .= '<span class="label">';
-      $r .= '<label for="limit">Limit</label>'.html_select_array($this->db()->limits,array(
-        'html'       => 'class="limit" name="limit" id="limit"',
-        'selected'   => $this->p('limit'),
+
+    #$criteria[] = html_select_array(ar_map('array($a == "html" ? "" : $a,strtoupper($a))',$this->formats));
+  # NB 01.03.16     $r .= '<label for="format">Format</label>'.html_select_array(array(
+  # NB 01.03.16       'table','div','csv','xml','json','yaml'
+      $r .= '<label for="format">Format</label>'.html_select_array($this->db()->formats,array(
+        'html'       => 'class="format" name="format" id="format"',
+        'selected'   => $this->p('format'),
         'prettyText' => true,
+        'sort' => 'natcasesort',
       ));
       $r .= '</span>';
-    }
 
-    // Submit
-    $r .= '<input type="submit" class="button button-small" value="GO"/>';
+      // Limit
+      if (!empty($this->db()->limits)) {
+        $r .= '<span class="label">';
+        $r .= '<label for="limit">Limit</label>'.html_select_array($this->db()->limits,array(
+          'html'       => 'class="limit" name="limit" id="limit"',
+          'selected'   => $this->p('limit'),
+          'prettyText' => true,
+        ));
+        $r .= '</span>';
+      }
+
+      // Submit
+      $r .= '<input type="submit" class="button button-small" value="GO"/>';
 
-    // Order By
-    /*
-    $r .= '<span class="label">';
-    $r .= '<label for="limit">OrderBy</label>'.html_select_array(array_keys($this->fields()),array(
-      'html'       => 'class="orderby" name="orderby" id="orderby"',
-      'selected'   => $this->p('orderby'),
-      'prettyText' => true,
-    ));
-    $r .= '</span>';
-    */
+      // Order By
+      /*
+      $r .= '<span class="label">';
+      $r .= '<label for="limit">OrderBy</label>'.html_select_array(array_keys($this->fields()),array(
+        'html'       => 'class="orderby" name="orderby" id="orderby"',
+        'selected'   => $this->p('orderby'),
+        'prettyText' => true,
+      ));
+      $r .= '</span>';
+      */
 
-    $r .= '</div>'; # < Options
+      $r .= '</div>'; # < Options
+
+    }
 
     //
     // Criterias
@@ -1481,6 +1485,7 @@ Class Table extends nb {
 
     }
 
+    if ($this->p('options')==='0') $r .= '<input type="submit" class="button button-small" value="GO"/>';
     $r .= '</div>'; # < Criterias
 
     ///