Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui - fixed submenu issue

This commit is contained in:
hkernbach 2017-03-22 15:40:44 +01:00
parent a7e69ca0ee
commit b7d165eed3
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js
View File

@ -294,7 +294,6 @@
);
if (!menu.disabled) {
$('#subNavigationBar .bottom').children().last().bind('click', function () {
$('#subNavigationBar .breadcrumb').html('');
window.App.navigate(menu.route, {trigger: true});
});
}

17
js/apps/system/_admin/aardvark/APP/frontend/js/views/userPermissions.js
View File

@ -103,8 +103,6 @@
this.breadcrumb();
arangoHelper.buildUserSubNav(this.currentUser.get('user'), 'Permissions');
var url = arangoHelper.databaseUrl('/_api/user/' + encodeURIComponent(self.currentUser.get('user')) + '/database');
if (frontendConfig.db === '_system') {
url = arangoHelper.databaseUrl('/_api/user/root/database');
@ -154,9 +152,18 @@
},
breadcrumb: function () {
$('#subNavigationBar .breadcrumb').html(
'User: ' + this.currentUser.get('user')
);
var self = this;
if (window.App.naviView) {
$('#subNavigationBar .breadcrumb').html(
'User: ' + this.currentUser.get('user')
);
arangoHelper.buildUserSubNav(self.currentUser.get('user'), 'Permissions');
} else {
window.setTimeout(function () {
self.breadcrumb();
}, 100);
}
}
});

19
js/apps/system/_admin/aardvark/APP/frontend/js/views/userView.js
View File

@ -31,13 +31,11 @@
},
continueRender: function () {
this.breadcrumb();
this.currentUser = this.collection.findWhere({
user: this.username
});
arangoHelper.buildUserSubNav(this.currentUser.get('user'), 'General');
this.breadcrumb();
if (this.currentUser.get('loggedIn')) {
this.editCurrentUser();
@ -307,9 +305,18 @@
},
breadcrumb: function () {
$('#subNavigationBar .breadcrumb').html(
'User: ' + this.username
);
var self = this;
if (window.App.naviView) {
$('#subNavigationBar .breadcrumb').html(
'User: ' + this.username
);
arangoHelper.buildUserSubNav(self.currentUser.get('user'), 'General');
} else {
window.setTimeout(function () {
self.breadcrumb();
}, 100);
}
}
});