From a43ae187d02f73fd8304ea648eef016adc9f4036 Mon Sep 17 00:00:00 2001
From: hkernbach <heiko@arangodb.com>
Date: Wed, 15 Jun 2016 00:18:13 +0200
Subject: [PATCH] better handling database creation [ci skip]

---
 .../APP/frontend/js/views/databaseView.js      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
index 3552502be4..e8644bcc4c 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
@@ -185,15 +185,10 @@
       };
 
       this.collection.create(options, {
-        wait: false,
         error: function(data, err) {
-          console.log("ERROR");
           self.handleError(err.status, err.statusText, dbname);
         },
-        success: function() {
-
-          //TODO
-          // add root user to newly created database
+        success: function(data) {
 
           if (userName !== 'root') {
             $.ajax({
@@ -214,12 +209,15 @@
             })
           });
 
-          self.updateDatabases();
-          arangoHelper.arangoNotification("Database created.");
-          window.modalView.hide();
-          window.App.naviView.dbSelectionView.render($("#dbSelect"));
+          if (window.location.hash === '#databases') {
+            self.updateDatabases();
+          }
+          arangoHelper.arangoNotification("Database " + data.get("name") + " created.");
         }
       });
+
+      arangoHelper.arangoNotification("Database creation in progress.");
+      window.modalView.hide();
     },
 
     submitDeleteDatabase: function(dbname) {