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

2014-03-12 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/module_manager_editor_plugin.php,
	include/javascript/pandora_modules.js: fixed the automagic deletion
	of macros when load a component.
	
	Incident: #654




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9565 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-12 11:06:06 +00:00
parent efa34633e1
commit 6ccbc87cbb
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2014-03-12 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_plugin.php,
include/javascript/pandora_modules.js: fixed the automagic deletion
of macros when load a component.
Incident: #654
2014-03-11 Sergio Martin <sergio.martin@artica.es> 2014-03-11 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Change the unknown mode * include/functions_graph.php: Change the unknown mode

8
pandora_console/godmode/agentes/module_manager_editor_plugin.php
View File

@ -87,13 +87,14 @@ if (!empty($macros)) {
$data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true); $data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true);
$table_simple->colspan['macro'.$m['macro']][1] = 3; $table_simple->colspan['macro'.$m['macro']][1] = 3;
$table_simple->rowclass['macro'.$m['macro']] = 'macro_field'; $table_simple->rowclass['macro'.$m['macro']] = 'macro_field';
push_table_simple ($data, 'macro'.$m['macro']); push_table_simple ($data, 'macro'.$m['macro']);
} }
} }
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var load_module_component = false;
function changePluginSelect() { function changePluginSelect() {
jQuery.post ("ajax.php", jQuery.post ("ajax.php",
{"page" : "godmode/servers/plugin", {"page" : "godmode/servers/plugin",
@ -107,5 +108,10 @@ function changePluginSelect() {
load_plugin_macros_fields('simple-macro'); load_plugin_macros_fields('simple-macro');
forced_title_callback(); forced_title_callback();
//For to avoid the deletion of macros in the code
//$("#network_component").change (function () {
//In the file pandora_modules.js
load_module_component = true;
} }
</script> </script>

9
pandora_console/include/javascript/pandora_modules.js
View File

@ -224,7 +224,7 @@ function configure_modules_form () {
}); });
network_component_group_change_event(); network_component_group_change_event();
$("#network_component").change (function () { $("#network_component").change (function () {
if (this.value == 0) if (this.value == 0)
return; return;
@ -327,8 +327,11 @@ function configure_modules_form () {
} }
} }
// Delete macro fields if (!load_module_component) {
$('.macro_field').remove(); // Delete macro fields
$('.macro_field').remove();
}
load_module_component = false;
$('#hidden-macros').val(''); $('#hidden-macros').val('');