tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New transmap in progress (problem with merge from develop)

This commit is contained in:
Arturo Gonzalez 2016-05-30 13:13:39 +02:00
parent a4dd64bb8e
commit 39d54518eb
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/constants.php
View File

@ -463,14 +463,11 @@ define("OPTION_SINGLE_SELECT_TIME", 7);
define("OPTION_CUSTOM_INPUT", 8); define("OPTION_CUSTOM_INPUT", 8);
define("OPTION_AGENT_AUTOCOMPLETE", 9); define("OPTION_AGENT_AUTOCOMPLETE", 9);
/* SAML attributes constants */
<<<<<<< HEAD
/* Transactional map constants */ /* Transactional map constants */
define("NODE_TYPE", 0); define("NODE_TYPE", 0);
define("ARROW_TYPE", 1); define("ARROW_TYPE", 1);
======= /* SAML attributes constants */
define("SAML_ROLE_AND_TAG", "eduPersonEntitlement"); define("SAML_ROLE_AND_TAG", "eduPersonEntitlement");
define("SAML_USER_DESC", "commonName"); define("SAML_USER_DESC", "commonName");
define("SAML_ID_USER_IN_PANDORA", "eduPersonTargetedId"); define("SAML_ID_USER_IN_PANDORA", "eduPersonTargetedId");
@ -529,5 +526,4 @@ define("DEFAULT_NODE_COLOR", COL_NOTINIT);
define("DEFAULT_NODE_IMAGE", "images/networkmap/unknown.png"); define("DEFAULT_NODE_IMAGE", "images/networkmap/unknown.png");
define("NODE_IMAGE_PADDING", 5); define("NODE_IMAGE_PADDING", 5);
>>>>>>> develop
?> ?>

6
pandora_console/operation/menu.php
View File

@ -121,9 +121,8 @@ if (check_acl ($config['id_user'], 0, "AR")) {
"operation/agentes/networkmap" "operation/agentes/networkmap"
); );
<<<<<<< HEAD
enterprise_hook ('transmap_console'); enterprise_hook ('transmap_console');
=======
$sub["operation/maps/networkmap_list"]["text"] = __('(Temp) Network map'); $sub["operation/maps/networkmap_list"]["text"] = __('(Temp) Network map');
$sub["operation/maps/networkmap_list"]["id"] = '(Temp) Network map'; $sub["operation/maps/networkmap_list"]["id"] = '(Temp) Network map';
$sub["operation/maps/networkmap_list"]["refr"] = 0; $sub["operation/maps/networkmap_list"]["refr"] = 0;
@ -131,9 +130,6 @@ if (check_acl ($config['id_user'], 0, "AR")) {
"operation/maps/networkmap" "operation/maps/networkmap"
); );
>>>>>>> develop
enterprise_hook ('networkmap_console'); enterprise_hook ('networkmap_console');
enterprise_hook ('services_menu'); enterprise_hook ('services_menu');