From da843bf45f6c0edfbc246efaacc8a329b2ce7a8b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 27 Aug 2012 10:54:16 -0400
Subject: [PATCH] Fixed: FS#2245 - Unable to move from the state "Installation Failed" of an app
---
interface/web/sites/list/database.list.php | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php
index edd895a..6163f37 100644
--- a/interface/web/sites/list/database.list.php
+++ b/interface/web/sites/list/database.list.php
@@ -13,7 +13,11 @@
// Name of the list
-$liste["name"] = "database";
+if($_SESSION['s']['user']['typ'] == 'admin') {
+ $liste["name"] = "database_admin";
+} else {
+ $liste["name"] = "database";
+}
// Database table
$liste["table"] = "web_database";
@@ -25,7 +29,7 @@
$liste["search_prefix"] = "search_";
// Records per page
-$liste["records_per_page"] = 15;
+$liste["records_per_page"] = "15";
// Script File of the list
$liste["file"] = "database_list.php";
@@ -66,6 +70,22 @@
'width' => "",
'value' => array('y' => "Yes",'n' => "No"));
+if($_SESSION['s']['user']['typ'] == 'admin') {
+$liste["item"][] = array( 'field' => "sys_groupid",
+ 'datatype' => "INTEGER",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
+ 'keyfield'=> 'groupid',
+ 'valuefield'=> 'name'
+ ),
+ 'width' => "",
+ 'value' => "");
+}
+
$liste["item"][] = array( 'field' => "server_id",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
@@ -80,14 +100,27 @@
'width' => "",
'value' => "");
-$liste["item"][] = array( 'field' => "database_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
+$liste["item"][] = array( 'field' => "database_user_id",
+ 'datatype' => "INTEGER",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT database_user_id, database_user FROM web_database_user WHERE {AUTHSQL} ORDER BY database_user',
+ 'keyfield'=> 'database_user_id',
+ 'valuefield'=> 'database_user'
+ ),
'width' => "",
'value' => "");
+$liste["item"][] = array( 'field' => "database_name",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "TEXT",
+ 'op' => "like",
+ 'prefix' => "%",
+ 'suffix' => "%",
+ 'width' => "",
+ 'value' => "");
?>
\ No newline at end of file
--
Gitblit v1.9.1