Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
This commit is contained in:
commit
778d5387d1
pandora_console/include/class
|
@ -151,8 +151,8 @@ class ModuleTemplates extends HTML
|
||||||
// Capture all parameters before start.
|
// Capture all parameters before start.
|
||||||
$this->id_np = get_parameter('id_np', -1);
|
$this->id_np = get_parameter('id_np', -1);
|
||||||
$this->action = get_parameter('action_button', '');
|
$this->action = get_parameter('action_button', '');
|
||||||
if ($this->id_np > 0 || empty($this->action)) {
|
|
||||||
// Profile exists. Set the attributes with the info.
|
// Profile exists. Set the attributes with the info.
|
||||||
|
if ($this->id_np > 0 || empty($this->action)) {
|
||||||
$this->setNetworkProfile();
|
$this->setNetworkProfile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -907,6 +907,7 @@ class ModuleTemplates extends HTML
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if ($createNewBlock === false) {
|
||||||
// Adding components button.
|
// Adding components button.
|
||||||
$inputs[] = [
|
$inputs[] = [
|
||||||
'arguments' => [
|
'arguments' => [
|
||||||
|
@ -918,6 +919,8 @@ class ModuleTemplates extends HTML
|
||||||
'return' => true,
|
'return' => true,
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
}
|
||||||
|
|
||||||
// Required for PEN field.
|
// Required for PEN field.
|
||||||
ui_require_jquery_file('tag-editor');
|
ui_require_jquery_file('tag-editor');
|
||||||
ui_require_css_file('jquery.tag-editor');
|
ui_require_css_file('jquery.tag-editor');
|
||||||
|
@ -1190,7 +1193,8 @@ class ModuleTemplates extends HTML
|
||||||
if (!failed) {
|
if (!failed) {
|
||||||
$(".ui-dialog-content").dialog("close");
|
$(".ui-dialog-content").dialog("close");
|
||||||
$(".info").hide();
|
$(".info").hide();
|
||||||
location.reload();
|
var id_np = <?php echo $this->id_np; ?>;
|
||||||
|
window.location = window.location.href+'&id_np='+id_np;
|
||||||
} else {
|
} else {
|
||||||
$(this).dialog("close");
|
$(this).dialog("close");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue