← Back to branch summary

~ko-de-r-de/zabbix/precise

« back to all changes in this revision

Viewing changes to frontends/php/services.php

  • Committer: guntis
  • Date: 2013-08-01 06:46:25 UTC
  • Revision ID: svn-v4:f4e7fd02-d210-4e34-a1e0-d4093fb66cc2:trunk:37472
..F....... [ZBX-4986] absolute urls replaced with relative and fixed commit bugs

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/services.php
431
431
        $servicesView->render();
432
432
        $servicesView->show();
433
433
}
 
434
// service list
434
435
else {
435
 
        // services
 
436
 
 
437
        // fetch services
436
438
        $services = API::Service()->get(array(
437
439
                'output' => array('name', 'serviceid', 'algorithm'),
438
440
                'selectParent' => array('serviceid'),
442
444
                'sortfield' => 'sortorder',
443
445
                'sortorder' => ZBX_SORT_UP
444
446
        ));
445
 
 
446
 
        // triggers
 
447
        // expand trigger descriptions
447
448
        $triggers = zbx_objectValues($services, 'trigger');
448
449
 
449
450
        $triggers = CMacrosResolverHelper::resolveTriggerNames($triggers);
455
456
        }
456
457
        unset($service);
457
458
 
458
 
        // nodes
459
 
        if ($data['displayNodes'] = is_array(get_current_nodeid())) {
460
 
                foreach ($services as &$service) {
461
 
                        $service['name'] = get_node_name_by_elid($service['serviceid'], true, NAME_DELIMITER).$service['name'];
462
 
                }
463
 
                unset($service);
464
 
        }
465
 
 
466
459
        $treeData = array();
467
460
        createServiceConfigurationTree($services, $treeData);
468
461
        $tree = new CServiceTree('service_conf_tree', $treeData, array(