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

Merge branch '1229-Codigos-QR-de-Pandora' into 'develop'

Browse Source 
Fix agent view qr mobile code - #1229

See merge request !751
This commit is contained in:
slerena 2017-08-28 12:28:43 +02:00
commit b504c0bc6f
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/agent_manager.php
View File

@ -232,7 +232,7 @@ if(!$new_agent){
if ($id_agente) { if ($id_agente) {
$table->data[2][2] = $table->data[2][2] =
"<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"" . "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"" .
ui_get_full_url('index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $id_agente) . "\" );'></a>"; ui_get_full_url('mobile/index.php?page=agent&id=' . $id_agente) . "\" );'></a>";
} }
else { else {
$table->data[2][2] = __("Only it is show when<br />the agent is saved."); $table->data[2][2] = __("Only it is show when<br />the agent is saved.");

2
pandora_console/mobile/include/user.class.php
View File

@ -239,7 +239,7 @@ class User {
$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' . $ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
$logo_image . '</div>'); $logo_image . '</div>');
$ui->contentAddHtml('<div id="login_container">'); $ui->contentAddHtml('<div id="login_container">');
$ui->beginForm(); $ui->beginForm('');
$ui->formAddHtml(html_print_input_hidden('action', 'login', true)); $ui->formAddHtml(html_print_input_hidden('action', 'login', true));
$options = array( $options = array(
'name' => 'user', 'name' => 'user',

10
pandora_console/mobile/index.php
View File

@ -191,6 +191,11 @@ switch ($action) {
$l10n = new gettext_reader (new CachedFileReader('../include/languages/'.$user_language.'.mo')); $l10n = new gettext_reader (new CachedFileReader('../include/languages/'.$user_language.'.mo'));
$l10n->load_tables(); $l10n->load_tables();
} }
if($_GET['page'] != ''){
header('refresh:0; url=http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
}
if (class_exists("HomeEnterprise")) if (class_exists("HomeEnterprise"))
$home = new HomeEnterprise(); $home = new HomeEnterprise();
else else
@ -211,6 +216,11 @@ switch ($action) {
$l10n = new gettext_reader (new CachedFileReader('../include/languages/'.$user_language.'.mo')); $l10n = new gettext_reader (new CachedFileReader('../include/languages/'.$user_language.'.mo'));
$l10n->load_tables(); $l10n->load_tables();
} }
if($_GET['page'] != ''){
header('refresh:0; url=http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
}
if (class_exists("HomeEnterprise")) if (class_exists("HomeEnterprise"))
$home = new HomeEnterprise(); $home = new HomeEnterprise();
else else