Updated Branches: refs/heads/master d272144ef -> 0979e5a0d
CLOUDSTACK-553:SRX - When adding SRX device make Public Network - default to untrusted and Private Network - default to trusted as un-editable fields Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0979e5a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0979e5a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0979e5a0 Branch: refs/heads/master Commit: 0979e5a0d0dc31ec510dbc2692dc6eeeb102ab6c Parents: d272144 Author: Pranav Saxena <[email protected]> Authored: Wed Nov 28 07:22:52 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Wed Nov 28 07:22:52 2012 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 12 ++++++++---- ui/scripts/ui/dialog.js | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0979e5a0/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 6bdff2e..516111b 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -3616,12 +3616,14 @@ publicnetwork: { label: 'label.public.network', defaultValue: 'untrusted', - docID: 'helpSRXPublicNetwork' + docID: 'helpSRXPublicNetwork', + isDisabled:true }, privatenetwork: { label: 'label.private.network', defaultValue: 'trusted', - docID: 'helpSRXPrivateNetwork' + docID: 'helpSRXPrivateNetwork', + isDisabled:true }, capacity: { label: 'label.capacity', @@ -6513,11 +6515,13 @@ // }, publicnetwork: { label: 'label.public.network', - defaultValue: 'untrusted' + defaultValue: 'untrusted', + isDisabled:true }, privatenetwork: { label: 'label.private.network', - defaultValue: 'trusted' + defaultValue: 'trusted', + isDisabled:true }, capacity: { label: 'label.capacity', http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0979e5a0/ui/scripts/ui/dialog.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js index 13a9160..5236bb6 100644 --- a/ui/scripts/ui/dialog.js +++ b/ui/scripts/ui/dialog.js @@ -368,6 +368,9 @@ $input.attr('id', inputId); $name.find('label').attr('for', inputId); + if(field.isDisabled) + $input.attr("disabled","disabled"); + // Tooltip if (field.docID) { $input.toolTip({
