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

2009-08-18 Miguel de Dios <miguel.dedios@artica.es> 

* ChangeLog: add comments of last commits, I forget update file.

	* godmode/reporting/map_builder.php: add check in javascript for form for to
	catch the try to save a item without name and withnout image.
	Fixes: 2815062


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1856 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-08-18 08:37:16 +00:00
parent 6a6ee100e5
commit 2b0e1f0f78
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pandora_console/ChangeLog
View File

@ -1,3 +1,31 @@
2009-08-18 Miguel de Dios <miguel.dedios@artica.es>
* ChangeLog: add comments of last commits, I forget update file.
* godmode/reporting/map_builder.php: add check in javascript for form for to
catch the try to save a item without name and withnout image.
Fixes: 2815062
2009-08-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php, godmode/alerts/configure_alert_compound.php:
add function "get_agent_module_id" for optain id_agent from id_agent_module.
And add new column in correlation condition that containts the name (and
link) of agent. And change ajax of page for show this column in the search
form in the bottom.
Fixes: 2838000
2009-08-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/map_builder.php: totaly fix the bug of map builder, now
you can use new ajax input to search the agent for item map.
Fixes: 2838013
2009-08-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/map_builder.php: partially fix the bug ID: 2838013, now
you can move the items in the map and Pandora console save the position. But
the edition of item data is'nt working although I am working in it.
2009-08-14 Miguel de Dios <miguel.dedios@artica.es> 2009-08-14 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php, godmode/agentes/massive_config.php, * godmode/agentes/agent_manager.php, godmode/agentes/massive_config.php,

15
pandora_console/godmode/reporting/map_builder.php
View File

@ -495,7 +495,20 @@ var id_agent_module = 0;
function testAgentCorrect() { function testAgentCorrect() {
if (selectAgent) return true; if (selectAgent) return true;
else { else {
alert ("<? echo __("No selected agent, please select any agent."); ?>"); if ($("#type").val() == 0) {
text_label = $("#text-label").val();
image = $("#image").val();
if (($("#text-label").val().length == 0) &&
($("#image").val().length == 0)) {
alert("<?php echo __("Please, choose a image or type name for element.");?>");
return false;
}
else
return true;
}
else
alert ("<?php echo __("No selected agent, please select any agent."); ?>");
return false; return false;
} }
} }