1
0
Эх сурвалжийг харах

Missing nav: nav on rendering some pages

Key Networks 7 жил өмнө
parent
commit
ac6a11653a

+ 2 - 2
src/controllers/networkController.js

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

+ 5 - 3
src/views/member_delete.pug

@@ -13,9 +13,11 @@ block net_content
 
   else
     .alert.alert-info
-      strong.
-        Note: To undo a member deletion, just get the member to 
-        join the network again
+      strong
+        ul
+          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='')
       button.btn.btn-primary(type='submit', name='delete') Delete #{member.name} (#{member.id})
       = ' '