cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 3eb899a
Date Mon, 23 Sep 2013 20:57:00 GMT
Updated Branches:
  refs/heads/4.2-forward 35e507615 -> 3eb899a5b


CLOUDSTACK-4128: UI > zone wizard > secondary storage step > provider "S3" > Create
NFS staging is required for S3 at this moment. So, disallow user to uncheck "Create NFS Secondary
Staging" checkbox when provider is "S3".


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3eb899a5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3eb899a5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3eb899a5

Branch: refs/heads/4.2-forward
Commit: 3eb899a5ba0b4350e09d3c147762b83291d9f804
Parents: 35e5076
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Sep 23 13:54:20 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Sep 23 13:54:20 2013 -0700

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3eb899a5/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 7b26790..960fcb7 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1913,13 +1913,7 @@
                                                  $fields.filter('[rel=usehttps]').hide();
                                                  $fields.filter('[rel=connectiontimeout]').hide();
                                                  $fields.filter('[rel=maxerrorretry]').hide();
-                                                 $fields.filter('[rel=sockettimeout]').hide();
-
-                                                 $fields.filter('[rel=createNfsCache]').find('input').attr('checked',
'checked');
-                                                 $fields.filter('[rel=createNfsCache]').find('input').attr("disabled",
"disabled");
-                                                 $fields.filter('[rel=createNfsCache]').css('display',
'inline-block');
-                                                 $fields.filter('[rel=nfsCacheNfsServer]').css('display',
'inline-block');
-                                                 $fields.filter('[rel=nfsCachePath]').css('display',
'inline-block');
+                                                 $fields.filter('[rel=sockettimeout]').hide();
  
                                             } else {
                                             	 $fields.filter('[rel=accesskey]').css('display',
'inline-block');
                                                  $fields.filter('[rel=secretkey]').css('display',
'inline-block');
@@ -1929,13 +1923,13 @@
                                                  $fields.filter('[rel=connectiontimeout]').css('display',
'inline-block');
                                                  $fields.filter('[rel=maxerrorretry]').css('display',
'inline-block');
                                                  $fields.filter('[rel=sockettimeout]').css('display',
'inline-block');
-
-                                                 $fields.filter('[rel=createNfsCache]').find('input').attr('checked',
'checked');
-                                                 $fields.filter('[rel=createNfsCache]').css('display',
'inline-block');
-                                                 $fields.filter('[rel=nfsCacheNfsServer]').css('display',
'inline-block');
-                                                 $fields.filter('[rel=nfsCachePath]').css('display',
'inline-block');
                                             }      
-
+                                            $fields.filter('[rel=createNfsCache]').find('input').attr('checked',
'checked');
+                                            $fields.filter('[rel=createNfsCache]').find('input').attr("disabled",
"disabled");  //Create NFS staging is required for S3 at this moment. So, disallow user to
uncheck "Create NFS Secondary Staging" checkbox
+                                            $fields.filter('[rel=createNfsCache]').css('display',
'inline-block');
+                                            $fields.filter('[rel=nfsCacheNfsServer]').css('display',
'inline-block');
+                                            $fields.filter('[rel=nfsCachePath]').css('display',
'inline-block');
+                                            
                                             //Swift
                                             $fields.filter('[rel=url]').hide();
                                             $fields.filter('[rel=account]').hide();


Mime
View raw message