diff options
author | Michael Klishin <klishinm@vmware.com> | 2021-10-07 03:06:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-07 03:06:05 +0300 |
commit | a50700bc5b13ce3dcc88bf7240aa2db395bb51cb (patch) | |
tree | 0bf701466282b932df9391d366291ed5127de354 | |
parent | 191baf47474f08fb425d8de64b45dc25195c7504 (diff) | |
parent | bfee99c1497520f6df988dd246b63e9e78ca65bf (diff) | |
download | rabbitmq-server-git-a50700bc5b13ce3dcc88bf7240aa2db395bb51cb.tar.gz |
Merge pull request #3547 from rabbitmq/mergify/bp/v3.9.x/pr-3545
fix: list exchanges in current virtual host in topic permissions (backport #3545)
-rw-r--r-- | deps/rabbitmq_management/priv/www/js/dispatcher.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/deps/rabbitmq_management/priv/www/js/dispatcher.js b/deps/rabbitmq_management/priv/www/js/dispatcher.js index feb1974c3c..758a240d30 100644 --- a/deps/rabbitmq_management/priv/www/js/dispatcher.js +++ b/deps/rabbitmq_management/priv/www/js/dispatcher.js @@ -190,12 +190,15 @@ dispatcher_add(function(sammy) { 'permissions': '/permissions'}, 'users'); sammy.get('#/users/:id', function() { var vhosts = JSON.parse(sync_get('/vhosts')); - render({'user': '/users/' + esc(this.params['id']), + const current_vhost = get_pref('vhost'); + let index_vhost = vhosts.findIndex(v => v.name === current_vhost); + index_vhost = index_vhost === -1 ? 0 : index_vhost; + render({'user': '/users/' + esc(this.params['id']), 'permissions': '/users/' + esc(this.params['id']) + '/permissions', 'topic_permissions': '/users/' + esc(this.params['id']) + '/topic-permissions', 'vhosts': '/vhosts/', - 'exchanges': '/exchanges/' + esc(vhosts[0].name)}, 'user', - '#/users'); + 'exchanges': '/exchanges/' + esc(vhosts[index_vhost].name)}, + 'user','#/users'); }); sammy.put('#/users-add', function() { res = sync_put(this, '/users/:username'); |