tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '990-advise-links-doesnt-work-in-open-version-dev' into 'develop'

Browse Source 
Changed bad ajax call

See merge request !562
This commit is contained in:
vgilc 2017-06-14 11:05:38 +02:00
commit 3ae20056fc
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/general/login_identification_wizard.php
View File

@ -49,7 +49,6 @@ if (is_ajax()) {
$not_return = get_parameter ('not_return', 0); $not_return = get_parameter ('not_return', 0);
$reset_initial_wizard = get_parameter ('reset_initial_wizard', 0); $reset_initial_wizard = get_parameter ('reset_initial_wizard', 0);
if ($reset_initial_wizard) { if ($reset_initial_wizard) {
config_update_value ('initial_wizard', 0); config_update_value ('initial_wizard', 0);
} }

7
pandora_console/index.php
View File

@ -1113,11 +1113,11 @@ require('include/php_to_js_values.php');
function first_time_identification () { function first_time_identification () {
run_identification_wizard (-1, -1, 1); run_identification_wizard (-1, -1, 1);
} }
var times_fired_register_wizard = 0; var times_fired_register_wizard = 0;
function run_identification_wizard (register, newsletter , return_button) { function run_identification_wizard (register, newsletter , return_button) {
if (times_fired_register_wizard) { if (times_fired_register_wizard) {
$(".ui-dialog-titlebar-close").show(); $(".ui-dialog-titlebar-close").show();
//Reset some values //Reset some values
@ -1147,10 +1147,9 @@ require('include/php_to_js_values.php');
$("#login_accept_register").dialog('open'); $("#login_accept_register").dialog('open');
} }
else { else {
$(".ui-dialog-titlebar-close").show(); $(".ui-dialog-titlebar-close").show();
$("#container").append('<div class="id_wizard"></div>'); $("#container").append('<div class="id_wizard"></div>');
jQuery.get ("ajax.php", jQuery.post ("ajax.php",
{"page": "general/login_identification_wizard", {"page": "general/login_identification_wizard",
"not_return": 1, "not_return": 1,
"force_register": register, "force_register": register,