From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/web/sites/list/database.list.php | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php
index 56bf15d..76dbec5 100644
--- a/interface/web/sites/list/database.list.php
+++ b/interface/web/sites/list/database.list.php
@@ -70,6 +70,19 @@
'width' => "",
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
+$liste["item"][] = array( 'field' => "type",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => array(
+ 'mongo' => "MongoDB",
+ 'mysql' => "MySQL"
+ )
+ );
+
if($_SESSION['s']['user']['typ'] == 'admin') {
$liste["item"][] = array( 'field' => "sys_groupid",
'datatype' => "INTEGER",
@@ -140,4 +153,4 @@
'width' => "",
'value' => "");
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1