From 48aa9585b1871014ae67fb99929e69af9f761abe Mon Sep 17 00:00:00 2001 From: lideming Date: Thu, 18 Feb 2021 10:54:39 +0800 Subject: [PATCH] Remove "members" and "name" pages which are merged into "detail" --- src/controllers/networkController.js | 32 ++----------- src/views/members.pug | 70 ---------------------------- src/views/name.pug | 28 ----------- 3 files changed, 4 insertions(+), 126 deletions(-) delete mode 100644 src/views/members.pug delete mode 100644 src/views/name.pug diff --git a/src/controllers/networkController.js b/src/controllers/networkController.js index c2e55f4..c705053 100644 --- a/src/controllers/networkController.js +++ b/src/controllers/networkController.js @@ -201,21 +201,15 @@ exports.name = async function(req, res) { let name = { name: req.body.name }; if (errors) { - try { - const network = await zt.network_detail(req.params.nwid); - res.render('name', {title: 'Rename network', navigate: navigate, network: network, name: name, errors: errors}); - } catch (err) { - res.render('name', {title: 'Rename network', navigate: navigate, error: 'Error resolving network detail for network ' + req.params.nwid + ': ' + err}); - } + console.error("network name validation errors", errors); } else { try { const network = await zt.network_object(req.params.nwid, name); - res.redirect('/controller/network/' + req.params.nwid); } catch ( err) { - res.render('name', {title: 'Rename network', navigate: navigate, error: 'Error renaming network ' + req.params.nwid + ': ' + err}); + console.error("Error renaming network " + req.params.nwid, err); } } - + res.redirect('/controller/network/' + req.params.nwid); }; // ipAssignmentPools POST @@ -577,7 +571,7 @@ exports.easy_post = async function(req, res) { } } -// Easy members auth GET or POST +// Easy members auth POST exports.members = async function(req, res) { const navigate = { @@ -646,24 +640,6 @@ exports.members = async function(req, res) { } } } - - try { - const network = await zt.network_detail(req.params.nwid); - const member_ids = await zt.members(req.params.nwid); - const members = []; - for (id in member_ids) { - let member = await zt.member_detail(req.params.nwid, id); - member.name = await storage.getItem(member.id) | ''; - members.push(member); - } - - res.render('members', {title: 'Members of this network', navigate: navigate, - network: network, members: members, errors: errors}); - } catch (err) { - res.render('members', {title: 'Members of this network', navigate: navigate, - error: 'Error resolving detail for network ' + req.params.nwid - + ': ' + err}); - } } // Member delete GET or POST diff --git a/src/views/members.pug b/src/views/members.pug deleted file mode 100644 index 69d91bb..0000000 --- a/src/views/members.pug +++ /dev/null @@ -1,70 +0,0 @@ -//- - ztncui - ZeroTier network controller UI - Copyright (C) 2017-2018 Key Networks (https://key-networks.com) - Licensed under GPLv3 - see LICENSE for details. - -extends network_layout - -block net_content - script. - $(function() { - $('.authCheck').on('click', function() { - $.post('', {'id': this.value, 'auth': this.checked}); - }); - $('.bridgeCheck').on('click', function() { - $.post('', {'id': this.value, 'activeBridge': this.checked}); - }); - $('.text').on('change', function() { - $.post('', {'id': this.name, 'name': this.value}); - }); - }); - - form(method='POST' action='') - table.table.table-responsive.table-striped.table-hover - tr - td(width='3%') - = '' - td(width='20%') - | Member name - td(width='10%') - | Member ID - td(width='10%') - | Authorized - td(width='10%') - | Active bridge - td(width='47%') - | IP assignment - each member in members - tr - - let url = '/controller/network/' + network.nwid + '/member/' + member.id - td - a(href=url + '/delete') - i.glyphicon.glyphicon-trash - td - input.form-control.text(type='text' name=member.id value=member.name) - td - a(href=url) #{member.id} - td - input.authCheck(type='checkbox' value=member.id checked=(member.authorized? true : false)) - td - input.bridgeCheck(type='checkbox' value=member.id checked=(member.activeBridge? true : false)) - td - each ipAssignment in member.ipAssignments - a(href='/controller/network/' + network.nwid + '/member/' + member.id + '/ipAssignments') - each digit in ipAssignment - = digit - = ' ' - else - a(href='/controller/network/' + network.nwid + '/member/' + member.id + '/ipAssignments') - | IP assignment - - else - .alert.alert-info - strong There are no members on this network - invite users to join #{network.nwid} - - a.btn.btn-default(href='' name='refresh' role='button') Refresh - - if errors - ul - for err in errors - li!= err.msg diff --git a/src/views/name.pug b/src/views/name.pug deleted file mode 100644 index 997ae7e..0000000 --- a/src/views/name.pug +++ /dev/null @@ -1,28 +0,0 @@ -//- - ztncui - ZeroTier network controller UI - Copyright (C) 2017-2018 Key Networks (https://key-networks.com) - Licensed under GPLv3 - see LICENSE for details. - -extends network_layout - -block net_content - form(method='POST' action='') - - .form-group.row - .col-sm-2 - label(for='name') Network name: - .col-sm-10 - input#name.form-control(type='text' name='name' placeholder='New network name' value=(undefined===network.name? '' : network.name)) - - .form-group.row - .col-sm-12 - button.btn.btn-primary(type='submit') Submit - = ' ' - a.btn.btn-default(href=('/controller/network/' + network.nwid) name='cancel' role='button') Cancel - - if errors - .row - .col-sm-12 - ul - for err in errors - li!= err.msg