You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/09/09 03:27:19 UTC

[51/52] ignite git commit: Web Console beta-3. Fixed import from database.

Web Console beta-3. Fixed import from database.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a117fec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a117fec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a117fec

Branch: refs/heads/master
Commit: 2a117fec92d3455e53933cd3992ac73d2b2c0d3a
Parents: 769e0be
Author: Andrey Novikov <an...@apache.org>
Authored: Thu Sep 8 16:53:11 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Thu Sep 8 16:53:11 2016 +0700

----------------------------------------------------------------------
 .../web-console/frontend/controllers/domains-controller.js   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2a117fec/modules/web-console/frontend/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/controllers/domains-controller.js b/modules/web-console/frontend/controllers/domains-controller.js
index e520494..6cb3540 100644
--- a/modules/web-console/frontend/controllers/domains-controller.js
+++ b/modules/web-console/frontend/controllers/domains-controller.js
@@ -385,8 +385,10 @@ export default ['domainsController', [
         $scope.showImportDomainModal = function() {
             LegacyTable.tableReset();
 
-            FormUtils.confirmUnsavedChanges($scope.ui.inputForm.$dirty, function() {
-                if ($scope.ui.inputForm.$dirty)
+            const dirty = $scope.ui.inputForm && $scope.ui.inputForm.$dirty;
+
+            FormUtils.confirmUnsavedChanges(dirty, function() {
+                if (dirty)
                     $scope.backupItem = $scope.selectedItem ? angular.copy($scope.selectedItem) : prepareNewItem();
 
                 const demo = $root.IgniteDemoMode;
@@ -441,7 +443,7 @@ export default ['domainsController', [
 
                                     $scope.ui.selectedJdbcDriverJar = $scope.jdbcDriverJars[0].value;
 
-                                    FormUtils.confirmUnsavedChanges($scope.ui.inputForm.$dirty, () => {
+                                    FormUtils.confirmUnsavedChanges(dirty, () => {
                                         $scope.importDomain.action = 'connect';
                                         $scope.importDomain.tables = [];