Updated Branches:
  refs/heads/master dfcded673 -> 4e9a97177

CS-15290: Fix 'Path' field validation

Original patch by: olga.smola
reviewed-by: brian


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

Branch: refs/heads/master
Commit: 4e9a97177f5b8cb94d18139e0513b870ede895a7
Parents: dfcded6
Author: bfederle <[email protected]>
Authored: Tue Jun 26 13:43:16 2012 -0700
Committer: bfederle <[email protected]>
Committed: Tue Jun 26 13:43:30 2012 -0700

----------------------------------------------------------------------
 ui/scripts/system.js |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4e9a9717/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 541aabc..6d3b765 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -7535,7 +7535,8 @@
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 
'inline-block');
                           
//$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.path"]+":");
-                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("Path:");
+                                                             var $required = 
$form.find('.form-item[rel=path]').find(".name").find("label span");
+                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("Path:").prepend($required);
 
                           //$('li[input_group="iscsi"]', 
$dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();
@@ -7557,7 +7558,8 @@
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 
'inline-block');
                           
//$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.path"]+":");
-                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("Path:");
+                                                             var $required = 
$form.find('.form-item[rel=path]').find(".name").find("label span");
+                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("Path:").prepend($required);
 
                           //$('li[input_group="iscsi"]', 
$dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();
@@ -7578,8 +7580,9 @@
 
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 
'inline-block');
-                          
//$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.SR.name"]+":");
-                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("SR 
Name-Label:");
+                          
//$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.SR.name"]+":");
                          
+                                                             var $required = 
$form.find('.form-item[rel=path]').find(".name").find("label span");
+                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("SR 
Name-Label:").prepend($required);
 
                           //$('li[input_group="iscsi"]', 
$dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();
@@ -7660,7 +7663,8 @@
 
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 
'inline-block');
-                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("Path:");
+                                                             var $required = 
$form.find('.form-item[rel=path]').find(".name").find("label span");
+                          
$form.find('.form-item[rel=path]').find(".name").find("label").text("Path:").prepend($required);
 
                           //$('li[input_group="iscsi"]', 
$dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();

Reply via email to