From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/form/database.tform.php | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php
index fb600fd..aef56f5 100644
--- a/interface/web/sites/form/database.tform.php
+++ b/interface/web/sites/form/database.tform.php
@@ -89,7 +89,10 @@
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'mysql',
- 'value' => array('mysql' => 'MySQL')
+ 'value' => array(
+ /*'mongo' => 'MongoDB',*/
+ 'mysql' => 'MySQL'
+ )
),
'database_name' => array (
'datatype' => 'VARCHAR',
@@ -114,6 +117,20 @@
'width' => '30',
'maxlength' => '25'
),
+ 'database_quota' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_database_quota_error_notint'),
+ ),
+ 'default' => '-1',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'database_user_id' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
--
Gitblit v1.9.1