Repository: cloudstack
Updated Branches:
  refs/heads/master 801a98617 -> 659eafffe


CLOUDSTACK-7483: UI > instance page, template page > hide "Original XS Version 
is 6.1+" field when OS Type is not Windows since property 
jsonObj.details.hypervisortoolsversion only applies to Windows - case sensitive 
when comparing OS Type.


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

Branch: refs/heads/master
Commit: 659eafffe1c59ed8f4c4eb3e157fbdcdd7674879
Parents: 801a986
Author: Jessica Wang <[email protected]>
Authored: Wed Sep 3 16:48:58 2014 -0700
Committer: Jessica Wang <[email protected]>
Committed: Wed Sep 3 16:48:58 2014 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js | 2 +-
 ui/scripts/templates.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/659eafff/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6870f5b..4d536e3 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1709,7 +1709,7 @@
                                                        break;
                                                }
                                        }                                       
-                                       if (ostypeName == undefined || 
ostypeName.indexOf("win") == -1) {                                              
 
+                                       if (ostypeName == undefined || 
ostypeName.indexOf("Win") == -1) {                                              
 
                                                
hiddenFields.push('xenserverToolsVersion61plus');
                                        }                                       
                                }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/659eafff/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index cef6a2a..dbc60b0 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -868,7 +868,7 @@
                                                                break;
                                                        }
                                                }                               
        
-                                               if (ostypeName == undefined || 
ostypeName.indexOf("win") == -1) {                                              
 
+                                               if (ostypeName == undefined || 
ostypeName.indexOf("Win") == -1) {                                              
 
                                                        
hiddenFields.push('xenserverToolsVersion61plus');
                                                }                               
        
                                        }
@@ -1241,7 +1241,7 @@
                                                                                
break;
                                                                        }
                                                                }               
                        
-                                                               if (ostypeName 
== undefined || ostypeName.indexOf("win") == -1) {                              
                 
+                                                               if (ostypeName 
== undefined || ostypeName.indexOf("Win") == -1) {                              
                 
                                                                        
hiddenFields.push('xenserverToolsVersion61plus');
                                                                }               
                        
                                                        }

Reply via email to