From 2cb426b464c2ecab8f764b81f516813ef30da845 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Wed, 16 Jan 2019 14:57:21 +0100 Subject: [PATCH] SQLite: Hide server field in login form --- adminer/include/adminer.inc.php | 4 ++-- adminer/static/editing.js | 12 ++++++++++++ changes.txt | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 5733b947..eba6d26c 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -119,9 +119,9 @@ class Adminer { function loginForm() { global $drivers; echo "\n"; - echo $this->loginFormField('driver', '
' . lang('System') . '', html_select("auth[driver]", $drivers, DRIVER) . "\n"); + echo $this->loginFormField('driver', '
' . lang('System') . '', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);") . "\n"); echo $this->loginFormField('server', '
' . lang('Server') . '', '' . "\n"); - echo $this->loginFormField('username', '
' . lang('Username') . '', '' . script("focus(qs('#username'));")); + echo $this->loginFormField('username', '
' . lang('Username') . '', '' . script("focus(qs('#username')); qs('#username').form['auth[driver]'].onchange();")); echo $this->loginFormField('password', '
' . lang('Password') . '', '' . "\n"); echo $this->loginFormField('db', '
' . lang('Database') . '', '' . "\n"); echo "
\n"; diff --git a/adminer/static/editing.js b/adminer/static/editing.js index a054b1bd..6030c226 100644 --- a/adminer/static/editing.js +++ b/adminer/static/editing.js @@ -82,6 +82,18 @@ function messagesPrint() { +/** Hide or show some login rows for selected driver +* @param HTMLSelectElement +*/ +function loginDriver(driver) { + var trs = parentTag(driver, 'table').rows; + var disabled = /sqlite/.test(selectValue(driver)); + alterClass(trs[1], 'hidden', disabled); // 1 - row with server + trs[1].getElementsByTagName('input')[0].disabled = disabled; +} + + + var dbCtrl; var dbPrevious = {}; diff --git a/changes.txt b/changes.txt index b4d3cbb7..352ed792 100644 --- a/changes.txt +++ b/changes.txt @@ -2,6 +2,7 @@ Adminer 4.7.1-dev: Display the tables scrollbar (bug #647) Add autocomplete attributes to login form PHP <5.4 compatibility even with ClickHouse enabled (regression from 4.7.0) +SQLite: Hide server field in login form Adminer 4.7.0 (released 2018-11-24): Simplify storing executed SQL queries to bookmarks