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

Merge branch 'ent-13801-tokens-repetidos-en-tabla-tconfig-welcome_state' into 'develop' 

fix remove welcome_state pandora_enterprise#13801

See merge request artica/pandorafms!7424
This commit is contained in:
Matias Didier 2024-05-27 14:33:23 +00:00
parent 498c15b97a f815b9dc1e
commit 118f3d1ec2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/extras/mr/69.sql
View File

@ -7790,4 +7790,9 @@ WHERE `content`= 'expect:root@%
cli\n
expect:root>&
UPDATE `tncm_script` SET `content` ='expect:root@%
cli\n
expect:root>
capture:show version|match Junos:\n
quit\n
expect:root@%
exit\n'
WHERE `content`='expect:root@%
cli\n
expect:root>
capture:show version|match Junos:\n
capture: \n
quit\n
expect:root@%
exit\n';
SET @id_token_welcome_state = NULL;
SET @token_name_welcome_state = 'welcome_state';
SELECT @id_token_welcome_state := `id_config` FROM `tconfig` WHERE `token` = @token_name_welcome_state ORDER BY `id_config` DESC LIMIT 1;
DELETE FROM `tconfig` WHERE `token` = @token_name_welcome_state AND `id_config` != @id_token_welcome_state;
COMMIT;

2
pandora_console/include/ajax/welcome_window.php
View File

@ -39,7 +39,7 @@ $ajaxPage = 'include/ajax/welcome_window';
$method = get_parameter('method', '');
if ($method === 'loadWelcomeWindow') {
unset($config['welcome_state']);
$config['welcome_state'] = 0;
}