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

2012-04-20 Sergio Martin <sergio.martin@artica.es> 

* include/help/en/help_network_map.php
	include/help/es/help_network_map.php
	operation/agentes/networkmap.php: Fixed bug changing the
	map name and improved the usability of the settings form



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6063 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-04-20 11:09:43 +00:00
parent c796863495
commit a2a56fa550
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-04-20 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_network_map.php
include/help/es/help_network_map.php
operation/agentes/networkmap.php: Fixed bug changing the
map name and improved the usability of the settings form
2012-04-20 Vanessa Gil <vanessa.gil@artica.es>
* godmode/menu.php: Changed default path to 'Module Manage'.

2
pandora_console/include/help/en/help_network_map.php
View File

@ -6,7 +6,7 @@
<h1>Network map</h1>
<p>This is the Network map section.</p>
<p>To save a created map, you must update it first.</p>
<p>To save a created map, you must apply the changes first.</p>
<p>To buid a submap, you must click on the edges.</p>

2
pandora_console/include/help/es/help_network_map.php
View File

@ -6,6 +6,6 @@
<h1>Mapa de red</h1>
<p>Esta es la sección de Mapas de red.</p>
<p>Para salvar un mapa creado, tu debes actualizarlo primero.</p>
<p>Para salvar un mapa creado, debes aplicar los cambios primero.</p>
<p>Para construir un submapa, debes hacer click en los bordes.</p>

11
pandora_console/operation/agentes/networkmap.php
View File

@ -102,7 +102,7 @@ if($save_networkmap || $update_networkmap) {
$subcheck = db_get_value('name', 'tnetwork_map', 'id_networkmap', $id_networkmap);
if($save_networkmap){
if (!$check && !preg_match("/$activeTab/", $name) || $subcheck == $name) {
if (!$check || $subcheck == $name) {
$result = networkmap_update_networkmap($id_networkmap, array('name' => $name, 'type' => $activeTab, 'layout' => $layout,
'nooverlap' => $nooverlap, 'simple' => $simple, 'regenerate' => $regen, 'font_size' => $font_size,
'id_group' => $group, 'id_module_group' => $module_group, 'depth' => $depth, 'only_modules_with_alerts' => $modwithalerts,
@ -114,12 +114,7 @@ if($save_networkmap || $update_networkmap) {
__('Could not save network map'), '', true);
}
else {
if (preg_match("/$activeTab/", $name)) {
$message = "<h3 class='error'>".__("Network map name cannot be manually defined as $activeTab")."</h3>";
}
else {
$message = "<h3 class='error'>".__('Each network map must have a different name')."</h3>";
}
$message = ui_print_error_message(__('Each network map must have a different name'),'',true);
}
}
}
@ -367,7 +362,7 @@ $options_form .= "</td>";
$options_form .= '<td>';
$options_form .= html_print_input_hidden('update_networkmap',1, true);
$options_form .= html_print_input_hidden('hidden_options',0, true);
$options_form .= html_print_submit_button (__('Update'), "updbutton", false, 'class="sub upd"', true);
$options_form .= html_print_submit_button (__('Apply'), "updbutton", false, 'class="sub next"', true);
$options_form .= '</td></tr>';
$options_form .= '</table></table></form>';