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

2013-08-16 Miguel de Dios <miguel.dedios@artica.es> 

* include/ajax/module.php, include/javascript/pandora_modules.js:
	fixed the ajax call to get the plugin fields in the form editor
	module plugin server.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8667 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-16 09:15:44 +00:00
parent cb9bec2ffc
commit cb923ec4bc
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-08-16 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/module.php, include/javascript/pandora_modules.js:
fixed the ajax call to get the plugin fields in the form editor
module plugin server.
2013-08-14 Ramon Novoa <rnovoa@artica.es> 2013-08-14 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/module_manager_editor_plugin.php, * godmode/agentes/module_manager_editor_plugin.php,

25
pandora_console/include/ajax/module.php
View File

@ -20,6 +20,19 @@ include_once($config['homedir'] . "/include/functions_agents.php");
include_once($config['homedir'] . "/include/functions_ui.php"); include_once($config['homedir'] . "/include/functions_ui.php");
require_once ($config['homedir'] . '/enterprise/include/functions_metaconsole.php'); require_once ($config['homedir'] . '/enterprise/include/functions_metaconsole.php');
$get_plugin_macros = get_parameter('get_plugin_macros');
if ($get_plugin_macros) {
$plugin_macros = db_get_value('macros','tplugin','id',get_parameter('id_plugin',0));
$macros = array();
$macros['base64'] = base64_encode($plugin_macros);
$macros['array'] = json_decode($plugin_macros,true);
echo json_encode($macros);
return;
}
ui_require_jquery_file ("ui-timepicker-addon"); ui_require_jquery_file ("ui-timepicker-addon");
// This script is included manually to be included after jquery and avoid error // This script is included manually to be included after jquery and avoid error
echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>'; echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
@ -44,18 +57,6 @@ if ($search_modules) {
echo json_encode($modules); echo json_encode($modules);
} }
$get_plugin_macros = get_parameter('get_plugin_macros');
if ($get_plugin_macros) {
$plugin_macros = db_get_value('macros','tplugin','id',get_parameter('id_plugin',0));
$macros = array();
$macros['base64'] = base64_encode($plugin_macros);
$macros['array'] = json_decode($plugin_macros,true);
echo json_encode($macros);
}
$get_module_detail = get_parameter ('get_module_detail', 0); $get_module_detail = get_parameter ('get_module_detail', 0);
if ($get_module_detail) { if ($get_module_detail) {

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

@ -572,7 +572,7 @@ function add_macro_field(macro, row_model_id) {
regex = /forced_title_(\w+)/; regex = /forced_title_(\w+)/;
var forced_title_id = field_desc.match(regex)[1]; var forced_title_id = field_desc.match(regex)[1];
var uniq_id = 'id' + (new Date()).getTime(); var uniq_id = 'id' + (new Date()).getTime();
field_desc = field_desc.replace(forced_title_id, uniq_id); field_desc = field_desc.replace(forced_title_id, uniq_id);
field_desc = field_desc.replace(forced_title_id, uniq_id); field_desc = field_desc.replace(forced_title_id, uniq_id);