Merge pull request #304 from pe4cey/neo4j-version

Only set neo4j version when server responds with a valid response
neo4j · Nov 1, 2016 · 2708c69 · 2708c69
2 parents 65b0534 + 53e7dff
commit 2708c69
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/scripts/controllers/ChangePassword.coffee b/app/scripts/controllers/ChangePassword.coffee
@@ -59,7 +59,6 @@ angular.module('neo4jApp.controllers')
             #New user who just changed the default password.
             if not is_authenticated
               $scope.$parent.defaultPasswordChanged()
-              Frame.create({input:"#{Settings.initCmd}"})
 
             $scope.password_changed = true
             $scope.$parent.frame.resetError()

diff --git a/app/scripts/controllers/Main.coffee b/app/scripts/controllers/Main.coffee
@@ -227,7 +227,7 @@ angular.module('neo4jApp.controllers')
           return Frame.create({input:"#{Settings.cmdchar}server connect"}) if !newUser
 
         $scope.$watch 'version', (val) ->
-          return '' if not val
+          return '' if not val or Object.keys(val).length is 0
           $scope.neo4j.version = val.version
           $scope.neo4j.edition = val.edition
           $scope.neo4j.enterpriseEdition = val.edition is 'enterprise'