freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Splitting site field: Now we track site and domain.

Browse source
This commit is contained in:
baldo 2018-12-17 20:06:39 +01:00
parent 7cec2788f8
commit 84b20b209e
8 changed files with 46 additions and 6 deletions
admin/js
main.js

15
admin/js/main.js
View file

@ -55,6 +55,15 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest
});
}
var domainChoices = [];
for (var i = 0; i < config.community.domains.length; i++) {
var domain = config.community.domains[i];
domainChoices.push({
label: domain,
value: domain
});
}
var header =
'<div class="navbar-header">' +
'<a class="navbar-brand" href="#" ng-click="appController.displayHome()">' +
@ -139,6 +148,7 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest
: '<i class="fa fa-times vpn-key-unset" aria-hidden="true" title="no VPN key"></i>';
}),
nga.field('site').map(nullable).cssClasses(nodeClasses),
nga.field('domain').map(nullable).cssClasses(nodeClasses),
nga.field('coords').label('GPS').cssClasses(nodeClasses).template(function (node) {
return node.values.coords
? '<i class="fa fa-map-marker coords-set" aria-hidden="true" title="coordinates set"></i>'
@ -170,6 +180,10 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest
.label('Site')
.pinned(false)
.choices(siteChoices),
nga.field('domain', 'choice')
.label('Domäne')
.pinned(false)
.choices(domainChoices),
nga.field('hasKey', 'choice')
.label('VPN key')
.pinned(false)
@ -270,6 +284,7 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest
nga.field('hostname').cssClasses(monitoringStateClasses),
nga.field('mac').cssClasses(monitoringStateClasses),
nga.field('site').map(nullable).cssClasses(monitoringStateClasses),
nga.field('domain').map(nullable).cssClasses(monitoringStateClasses),
nga.field('monitoring_state').cssClasses(monitoringStateClasses).template(function (monitoringState) {
switch (monitoringState.values.monitoring_state) {
case 'active':