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

2009-01-12 Esteban Sanchez <estebans@artica.es> 

* godmode/alerts/configure_alert_template.php: Fixed a bug when going
        forward from step 2 when creating a template.

        * pandoradb_migrate_20_to_21.sql: Added a comment on a line which was
        missing it.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Esteban Sanchez 2009-01-14 09:22:07 +00:00
parent 12412f8b0a
commit e7680e04b5
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,4 +1,12 @@
2009-01-12 Sancho Lerena <lsrena@artica.es>
2009-01-12 Esteban Sanchez <estebans@artica.es>
* godmode/alerts/configure_alert_template.php: Fixed a bug when going
forward from step 2 when creating a template.
* pandoradb_migrate_20_to_21.sql: Added a comment on a line which was
missing it.
2009-01-12 Sancho Lerena <slrena@artica.es>
* functions_db.php,
* godmode/agentes/configurar_agente.php: Delete module deletes

10
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -35,7 +35,7 @@ function print_alert_template_steps ($step, $id) {
/* Step 1 */
if ($step == 1)
echo '<strong>';
if ($id) {
if ($id && ! isset ($_POST['create_template'])) {
echo '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id='.$id.'">';
echo __('Step').' 1 : '.__('Conditions');
echo '</a>';
@ -50,7 +50,7 @@ function print_alert_template_steps ($step, $id) {
if ($step == 2)
echo '<strong>';
if ($id) {
if ($id && ! isset ($_POST['create_template'])) {
echo '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id='.$id.'&step=2">';
echo __('Step').' 2 : '.__('Firing');
echo '</a>';
@ -65,7 +65,7 @@ function print_alert_template_steps ($step, $id) {
if ($step == 3)
echo '<strong>';
if ($id) {
if ($id && ! isset ($_POST['create_template'])) {
echo '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&id='.$id.'&step=3">';
echo __('Step').' 3 : '.__('Recovery');
echo '</a>';
@ -220,6 +220,8 @@ if ($create_template) {
/* Go to previous step in case of error */
if ($result === false)
$step = $step - 1;
else
$id = $result;
}
if ($update_template) {
@ -233,7 +235,7 @@ if ($update_template) {
}
}
if ($id) {
if ($id && ! $create_template) {
$template = get_alert_template ($id);
$name = $template['name'];
$description = $template['description'];

2
pandora_console/pandoradb_migrate_20_to_21.sql
View File

@ -111,7 +111,7 @@ talert_template_modules(`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- If you have custom stuff here, please make sure you manually
migrate it.
-- migrate it.
-- DROP TABLE `talerta`