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

2014-07-22 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/agent_manager.php: fixed to show the QR code image
	in the creation of a new agent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10345 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-07-22 16:03:27 +00:00
parent b670c9c922
commit cb19580233
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2014-07-22 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: fixed to show the QR code image
in the creation of a new agent.
2014-07-21 Miguel de Dios <miguel.dedios@artica.es> 2014-07-21 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.postgreSQL.sql: fixed the SQL. * pandoradb.postgreSQL.sql: fixed the SQL.

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

@ -159,7 +159,8 @@ if ($id_agente) {
$table->data[0][1] .= "&nbsp;<b>" . __("ID") . "</b>&nbsp; $id_agente &nbsp;"; $table->data[0][1] .= "&nbsp;<b>" . __("ID") . "</b>&nbsp; $id_agente &nbsp;";
$table->data[0][1] .= '&nbsp;&nbsp;<a href="index.php?sec=gagente&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">'; $table->data[0][1] .= '&nbsp;&nbsp;<a href="index.php?sec=gagente&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">';
$table->data[0][1] .= html_print_image ("images/zoom.png", true, array ("border" => 0, "title" => __('Agent detail'))); $table->data[0][1] .= html_print_image ("images/zoom.png",
true, array ("border" => 0, "title" => __('Agent detail')));
$table->data[0][1] .= '</a>'; $table->data[0][1] .= '</a>';
} }
@ -215,9 +216,14 @@ if ($id_agente) {
</style> </style>
<?php <?php
$table->rowspan[1][2] = 7; $table->rowspan[1][2] = 7;
$table->data[1][2] = if ($id_agente) {
"<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"" . $table->data[1][2] =
ui_get_full_url('index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $id_agente) . "\" );'></a>"; "<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>";
}
else {
$table->data[1][2] = __("Only it is show when<br />the agent is saved.");
}
$groups = users_get_groups ($config["id_user"], "AR",false); $groups = users_get_groups ($config["id_user"], "AR",false);
$agents = agents_get_group_agents (array_keys ($groups)); $agents = agents_get_group_agents (array_keys ($groups));