From 08a2837f974d1101ab22af3f2cfec5ac417c4508 Mon Sep 17 00:00:00 2001 From: lideming Date: Wed, 3 Mar 2021 00:50:28 +0800 Subject: [PATCH] Rename network property pages to have prefix --- src/controllers/networkController.js | 4 ++-- .../{ipAssignments.pug => member_prop_ipAssignments.pug} | 0 src/views/{dns.pug => network_prop_dns.pug} | 0 ...AssignmentPools.pug => network_prop_ipAssignmentPools.pug} | 0 src/views/{private.pug => network_prop_private.pug} | 0 src/views/{routes.pug => network_prop_routes.pug} | 0 src/views/{v4AssignMode.pug => network_prop_v4AssignMode.pug} | 0 src/views/{v6AssignMode.pug => network_prop_v6AssignMode.pug} | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename src/views/{ipAssignments.pug => member_prop_ipAssignments.pug} (100%) rename src/views/{dns.pug => network_prop_dns.pug} (100%) rename src/views/{ipAssignmentPools.pug => network_prop_ipAssignmentPools.pug} (100%) rename src/views/{private.pug => network_prop_private.pug} (100%) rename src/views/{routes.pug => network_prop_routes.pug} (100%) rename src/views/{v4AssignMode.pug => network_prop_v4AssignMode.pug} (100%) rename src/views/{v6AssignMode.pug => network_prop_v6AssignMode.pug} (100%) diff --git a/src/controllers/networkController.js b/src/controllers/networkController.js index c13c299..c42abba 100644 --- a/src/controllers/networkController.js +++ b/src/controllers/networkController.js @@ -184,7 +184,7 @@ exports.network_object = async function(req, res) { try { const network = await zt.network_detail(req.params.nwid); navigate.whence = '/controller/network/' + network.nwid; - res.render(req.params.object, {title: req.params.object, navigate: navigate, network: network}, function(err, html) { + res.render('network_prop_' + req.params.object, {title: req.params.object, navigate: navigate, network: network}, function(err, html) { if (err) { if (err.message.indexOf('Failed to lookup view') !== -1 ) { return res.render('not_implemented', {title: req.params.object, navigate: navigate, network: network}); @@ -515,7 +515,7 @@ exports.member_object = async function(req, res) { try { const {network, member} = await get_network_member(req.params.nwid, req.params.id); navigate.whence = '/controller/network/' + network.nwid + '#members'; - res.render(req.params.object, {title: req.params.object, navigate: navigate, network: network, member: member}, function(err, html) { + res.render('member_prop_' + req.params.object, {title: req.params.object, navigate: navigate, network: network, member: member}, function(err, html) { if (err) { if (err.message.indexOf('Failed to lookup view') !== -1 ) { return res.render('not_implemented', {title: req.params.object, navigate: navigate, network: network, member: member}); diff --git a/src/views/ipAssignments.pug b/src/views/member_prop_ipAssignments.pug similarity index 100% rename from src/views/ipAssignments.pug rename to src/views/member_prop_ipAssignments.pug diff --git a/src/views/dns.pug b/src/views/network_prop_dns.pug similarity index 100% rename from src/views/dns.pug rename to src/views/network_prop_dns.pug diff --git a/src/views/ipAssignmentPools.pug b/src/views/network_prop_ipAssignmentPools.pug similarity index 100% rename from src/views/ipAssignmentPools.pug rename to src/views/network_prop_ipAssignmentPools.pug diff --git a/src/views/private.pug b/src/views/network_prop_private.pug similarity index 100% rename from src/views/private.pug rename to src/views/network_prop_private.pug diff --git a/src/views/routes.pug b/src/views/network_prop_routes.pug similarity index 100% rename from src/views/routes.pug rename to src/views/network_prop_routes.pug diff --git a/src/views/v4AssignMode.pug b/src/views/network_prop_v4AssignMode.pug similarity index 100% rename from src/views/v4AssignMode.pug rename to src/views/network_prop_v4AssignMode.pug diff --git a/src/views/v6AssignMode.pug b/src/views/network_prop_v6AssignMode.pug similarity index 100% rename from src/views/v6AssignMode.pug rename to src/views/network_prop_v6AssignMode.pug