Fix browser history handling, Refs #2299

snf-cyclades-app/Changelog

 Changelog
 =========
 
+
+Development
+-----------
+
+* Fix history handling (#2299)
+
+
 v0.9.11
 -------
 

snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_main_view.js

@@ -624,9 +624,9 @@
             this.loaded = true;
             
             // application start point
-            this.show_initial_view();
 
             this.check_empty();
+            this.show_initial_view();
         },
 
         load: function() {

snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_router.js

@@ -70,14 +70,13 @@
         show_welcome: function() {
             if (snf.storage.vms.length == 0) {
                 ui.main.show_empty();
-                this.navigate("welcome/");
             } else {
                 this.index();
             }
         },
 
         index: function() {
-            this.vms_index();
+            ui.main.show_view("icon");
         },
 
         vms_index: function() {