fixed a routing bug in the ui (arangodb#7067)

hkernbach · mchacki · commit 83785de99317 · 2018-10-25T16:11:17.000+02:00
* fixed a routing bug in backbone js ui

* use of navigate

* changelog

* fixes same issue in another view, too
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 devel
 -----
 
+* fixes a routing issue within the web ui after the use of views
 
 * fixes some graph data parsing issues in the ui, e.g. cleaning up duplicate
   edges inside the graph viewer.
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
@@ -72,8 +72,10 @@
 
     redirectToGraphViewer: function (e) {
       var name = $(e.currentTarget).attr('id');
-      name = name.substr(0, name.length - 5);
-      window.location.hash = window.location.hash.substr(0, window.location.hash.length - 1) + '/' + encodeURIComponent(name);
+      if (name) {
+        name = name.substr(0, name.length - 5);
+        window.App.navigate('graph/' + encodeURIComponent(name), {trigger: true});
+      }
     },
 
     loadGraphViewer: function (graphName, refetch) {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/viewsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/viewsView.js
@@ -30,7 +30,7 @@
     events: {
       'click #createView': 'createView',
       'click #viewsToggle': 'toggleSettingsDropdown',
-      'click .tile': 'gotoView',
+      'click .tile-view': 'gotoView',
       'keyup #viewsSearchInput': 'search',
       'click #viewsSearchSubmit': 'search',
       'click #viewsSortDesc': 'sorting'
@@ -151,7 +151,8 @@
     gotoView: function (e) {
       var name = $(e.currentTarget).attr('id');
       if (name) {
-        window.location.hash = window.location.hash.substr(0, window.location.hash.length - 1) + '/' + encodeURIComponent(name);
+        var url = 'view/' + encodeURIComponent(name);
+        window.App.navigate(url, {trigger: true});
       }
     },
 
