ZeroTier/ztncui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missing nav: nav on rendering some pages

Browse Source
This commit is contained in:
Key Networks 2018-02-01 10:41:19 +08:00
parent 26f4d51679
commit ac6a11653a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/networkController.js
View File

@ -656,7 +656,7 @@ exports.member_delete = async function(req, res) {
nav.whence = '/controller/network/' + network.nwid + '/members'; nav.whence = '/controller/network/' + network.nwid + '/members';
res.render('member_delete', {title: 'Delete member from ' + network.name, res.render('member_delete', {title: 'Delete member from ' + network.name,
network: network, member: member}); nav: nav, network: network, member: member});
} catch (err) { } catch (err) {
res.render('member_delete', {title: 'Delete member from network', nav: nav, res.render('member_delete', {title: 'Delete member from network', nav: nav,
error: 'Error resolving detail for member ' + req.params.id error: 'Error resolving detail for member ' + req.params.id
@ -686,7 +686,7 @@ exports.delete_ip = async function(req, res) {
member.id + '/ipAssignments'); member.id + '/ipAssignments');
} }
res.render('ipAssignments', {title: 'ipAssignments ' + network.name, res.render('ipAssignments', {title: 'ipAssignments ' + network.name,
index: req.params.index, network: network, member: member}); nav: nav, index: req.params.index, network: network, member: member});
} catch (err) { } catch (err) {
res.render('ipAssignments', {title: 'ipAssignments', nav: nav, res.render('ipAssignments', {title: 'ipAssignments', nav: nav,
error: 'Error resolving detail for member ' + req.params.id error: 'Error resolving detail for member ' + req.params.id

8
src/views/member_delete.pug
View File

@ -13,9 +13,11 @@ block net_content
else else
.alert.alert-info .alert.alert-info
strong. strong
Note: To undo a member deletion, just get the member to ul
join the network again li To undo a member deletion, just get the member to join the network again.
li After deleting a member, you may see them appear in the list of members again. This is a ZeroTier issue. Just get the user to leave the network.
form(method='POST' action='') form(method='POST' action='')
button.btn.btn-primary(type='submit', name='delete') Delete #{member.name} (#{member.id}) button.btn.btn-primary(type='submit', name='delete') Delete #{member.name} (#{member.id})
= ' ' = ' '