From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/vm/form/openvz_vm.tform.php | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/interface/web/vm/form/openvz_vm.tform.php b/interface/web/vm/form/openvz_vm.tform.php
index 666d06c..44f20dc 100644
--- a/interface/web/vm/form/openvz_vm.tform.php
+++ b/interface/web/vm/form/openvz_vm.tform.php
@@ -150,6 +150,17 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'bootorder' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'default' => '0',
+ 'value' => '',
+ 'width' => '3',
+ 'maxlength' => '3',
+ 'validators' => array ( 0 => array ( 'type' => 'ISPOSITIVE',
+ 'errmsg'=> 'bootorder_error_notpositive'),
+ ),
+ ),
'active' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
@@ -322,11 +333,34 @@
'width' => '30',
'maxlength' => '255'
),
+ 'custom' => array (
+ 'datatype' => 'TEXT',
+ 'formtype' => 'TEXTAREA',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '',
+ 'maxlength' => '',
+ 'rows' => '10',
+ 'cols' => '30',
+ 'searchable' => 2,
+ 'validators' => array ( 0 => array ('type' => 'CUSTOM',
+ 'class' => 'validate_openvz',
+ 'function' => 'check_custom',
+ 'errmsg'=> 'custom_error'),
+ ),
+ ),
//#################################
// ENDE Datatable fields
//#################################
)
);
+
+ $form["tabs"]['additional_ip'] = array (
+ 'title' => "Additional IP",
+ 'width' => 100,
+ 'template' => "templates/openvz_vm_additional_ip_edit.htm",
+ );
}
--
Gitblit v1.9.1