From 9d29a0dc738f027f45c692f17cb0fe0136e866e3 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Thu, 5 Mar 2020 22:31:02 +0100 Subject: [PATCH] =?UTF-8?q?update=20Do=205.=20M=C3=A4r=2022:31:01=20CET=20?= =?UTF-8?q?2020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/routing.js | 21 ++++++--------------- views/admin/adm_edit_users.pug | 4 ++-- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/server/routing.js b/server/routing.js index 5e2bda2..537a446 100755 --- a/server/routing.js +++ b/server/routing.js @@ -169,24 +169,15 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp) var waip_uuid = req.params.waip_uuid; sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) { - if (einsatzdaten) { - - - + if (einsatzdaten) { sql.db_check_permission(req.user, einsatzdaten.id, function(valid) { - //console.log(permissions + ' ' + wachen_nr); - //if (permissions == wachen_nr || permissions == 'admin') {} else { if (!valid) { - //einsatzdaten.objekt = ''; - einsatzdaten.besonderheiten = 'nicht angemeldet'; - //einsatzdaten.strasse = ''; - //einsatzdaten.wgs84_x = einsatzdaten.wgs84_x.substring(0, einsatzdaten.wgs84_x.indexOf('.') + 3); - //einsatzdaten.wgs84_y = einsatzdaten.wgs84_y.substring(0, einsatzdaten.wgs84_y.indexOf('.') + 3); + delete einsatzdaten.objekt; + delete einsatzdaten.besonderheiten; + delete einsatzdaten.strasse; + delete einsatzdaten.wgs84_x; + delete einsatzdaten.wgs84_y; }; - - - - res.render('rmld', { public: app_cfg.public, title: 'Einsatz-Rückmeldung', diff --git a/views/admin/adm_edit_users.pug b/views/admin/adm_edit_users.pug index 40e2d47..f846352 100644 --- a/views/admin/adm_edit_users.pug +++ b/views/admin/adm_edit_users.pug @@ -39,7 +39,7 @@ block content p='IP-Adresse: ' + val.ip_address .card-footer.text-right button.btn.btn-primary.mx-2.ion-md-create(onclick='EditUser(this);', data-id=val.id, data-user=val.user, data-permissions=val.permissions, data-ip_address=val.ip_address) Bearbeiten - form(action='/edit_users', method='POST', style='display:inline-block;') + form(action='/adm_edit_users', method='POST', style='display:inline-block;') input(type='hidden', name='modal_method', value='DELETE') input(type='hidden', name='id', value=val.id) input(type='hidden', name='username', value=val.user) @@ -53,7 +53,7 @@ block content button.close(type='button', data-dismiss='modal', aria-label='Close') span(aria-hidden='true') × .modal-body - form#formModal(action="/edit_users", method="POST", oninput='password2.setCustomValidity(password2.value != password.value ? "Passwörter stimmen nicht überein!" : "")') + form#formModal(action="/adm_edit_users", method="POST", oninput='password2.setCustomValidity(password2.value != password.value ? "Passwörter stimmen nicht überein!" : "")') .form-group input#modal_method(type='hidden', name='modal_method', value='') input#modal_id(type='hidden', name='modal_id', value='')