mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Do 5. Mär 22:31:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-03-05 22:31:02 +01:00
parent 93784d4f50
commit 9d29a0dc73
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/routing.js
View File

@ -169,24 +169,15 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
var waip_uuid = req.params.waip_uuid; var waip_uuid = req.params.waip_uuid;
sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) { sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) {
if (einsatzdaten) { if (einsatzdaten) {
sql.db_check_permission(req.user, einsatzdaten.id, function(valid) { sql.db_check_permission(req.user, einsatzdaten.id, function(valid) {
//console.log(permissions + ' ' + wachen_nr);
//if (permissions == wachen_nr || permissions == 'admin') {} else {
if (!valid) { if (!valid) {
//einsatzdaten.objekt = ''; delete einsatzdaten.objekt;
einsatzdaten.besonderheiten = 'nicht angemeldet'; delete einsatzdaten.besonderheiten;
//einsatzdaten.strasse = ''; delete einsatzdaten.strasse;
//einsatzdaten.wgs84_x = einsatzdaten.wgs84_x.substring(0, einsatzdaten.wgs84_x.indexOf('.') + 3); delete einsatzdaten.wgs84_x;
//einsatzdaten.wgs84_y = einsatzdaten.wgs84_y.substring(0, einsatzdaten.wgs84_y.indexOf('.') + 3); delete einsatzdaten.wgs84_y;
}; };
res.render('rmld', { res.render('rmld', {
public: app_cfg.public, public: app_cfg.public,
title: 'Einsatz-Rückmeldung', title: 'Einsatz-Rückmeldung',

4
views/admin/adm_edit_users.pug
View File

@ -39,7 +39,7 @@ block content
p='IP-Adresse: ' + val.ip_address p='IP-Adresse: ' + val.ip_address
.card-footer.text-right .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 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='modal_method', value='DELETE')
input(type='hidden', name='id', value=val.id) input(type='hidden', name='id', value=val.id)
input(type='hidden', name='username', value=val.user) input(type='hidden', name='username', value=val.user)
@ -53,7 +53,7 @@ block content
button.close(type='button', data-dismiss='modal', aria-label='Close') button.close(type='button', data-dismiss='modal', aria-label='Close')
span(aria-hidden='true') × span(aria-hidden='true') ×
.modal-body .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 .form-group
input#modal_method(type='hidden', name='modal_method', value='') input#modal_method(type='hidden', name='modal_method', value='')
input#modal_id(type='hidden', name='modal_id', value='') input#modal_id(type='hidden', name='modal_id', value='')