commit 0ba3cca0fe16ee74555c72f12af3b477bf6dc698 Author: Philipp Hahn Date: Tue Jun 26 18:57:30 2012 +0200 Bug #27747: Validate memory size Use the same regexp as in the DomainWizard to validate the entered memory size. diff --git a/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/changelog b/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/changelog index 0c35bd5..6c2e28a 100644 --- a/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/changelog +++ b/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/debian/changelog @@ -1,3 +1,9 @@ +univention-virtual-machine-manager-daemon (1.0.109-1) unstable; urgency=low + + * Validate memory size (Bug #27747) + + -- Philipp Hahn Tue, 26 Jun 2012 18:56:11 +0200 + univention-virtual-machine-manager-daemon (1.0.108-1) unstable; urgency=low * Fix image format detectin on attach (Bug #25169) diff --git a/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/_uvmm/DomainPage.js b/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/_uvmm/DomainPage.js index b984469..7b49bcc 100644 --- a/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/_uvmm/DomainPage.js +++ b/branches/ucs-3.0/ucs/virtualization/univention-virtual-machine-manager-daemon/umc/js/_uvmm/DomainPage.js @@ -183,6 +183,9 @@ dojo.declare("umc.modules._uvmm.DomainPage", [ umc.widgets.TabContainer, umc.wid }, { name: 'maxMem', type: 'TextBox', + required: true, + regExp: '^[0-9]+(?:[,.][0-9]+)?[ \t]*([KkMmGg]?[bB])?$', + invalidMessage: this._( 'The memory size format is not valid (e.g. 3GB or 1024 MB)' ), label: this._('Memory') }, { name: 'boot_hvm',