Merge pull request #122 from QiRaining/master.ps.error

[FIX]Cannot read property 'indexOf' of null
zstackio · Sep 26, 2016 · 8c12464 · 8c12464
2 parents 69453e9 + 9e35417
commit 8c12464
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ts/primaryStorage.ts b/ts/primaryStorage.ts
@@ -979,8 +979,10 @@ module MPrimaryStorage {
 
               return true;
             } else if (this.type == 'SharedMountPoint' || this.type == 'IscsiFileSystemBackendPrimaryStorage' || this.type == 'LocalStorage' && Utils.notNullnotUndefined(this.url)) {
-              if (this.url.indexOf('/') != 0) {
-                return false;
+              if (!!this.url) {
+                if (this.url.indexOf('/') != 0) {
+                  return false;
+                }
               }
 
               return true;

diff --git a/zstack_dashboard/static/app/app.js b/zstack_dashboard/static/app/app.js
@@ -11199,8 +11199,10 @@ var MPrimaryStorage;
                             return true;
                         }
                         else if (this.type == 'SharedMountPoint' || this.type == 'IscsiFileSystemBackendPrimaryStorage' || this.type == 'LocalStorage' && Utils.notNullnotUndefined(this.url)) {
-                            if (this.url.indexOf('/') != 0) {
-                                return false;
+                            if (!!this.url) {
+                                if (this.url.indexOf('/') != 0) {
+                                    return false;
+                                }
                             }
                             return true;
                         }