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

2012-03-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* general/shortcut_bar.php: Fixed Ajax callbacks in this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-03-12 18:00:03 +00:00
parent 78377dda0d
commit 0e16e2e14b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2012-03-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* general/shortcut_bar.php: Fixed Ajax callbacks in this view.
2012-03-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-03-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_ui.php: Skin is not used on logon error. * include/functions_ui.php: Skin is not used on logon error.

17
pandora_console/general/shortcut_bar.php
View File

@ -43,15 +43,6 @@ if (is_ajax()){
} }
} }
return;
}
$shortcut_state = db_get_value_filter('shortcut', 'tusuario', array('id_user' => $config['id_user']));
// If shortcut bar is disabled return to index.php
if ($shortcut_state == 0)
return;
if (is_ajax()) {
require_once("include/functions_events.php"); require_once("include/functions_events.php");
@ -67,6 +58,7 @@ if (is_ajax()) {
// Get critical events (realtime update) // Get critical events (realtime update)
if ($get_critical_events){ if ($get_critical_events){
$own_info = get_user_info ($config['id_user']); $own_info = get_user_info ($config['id_user']);
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
@ -116,10 +108,15 @@ if (is_ajax()) {
$shortcut_incidents = $result_incidents_update[0]['total_incidents']; $shortcut_incidents = $result_incidents_update[0]['total_incidents'];
echo $shortcut_incidents; echo $shortcut_incidents;
} }
return; return;
} }
$shortcut_state = db_get_value_filter('shortcut', 'tusuario', array('id_user' => $config['id_user']));
// If shortcut bar is disabled return to index.php
if ($shortcut_state == 0)
return;
if ($shortcut_state == 2) { if ($shortcut_state == 2) {
echo "<div id='shortcut_button' style='position: fixed; overflow: hidden; bottom: 0px; left: 0px; width: 185px; height: 40px; background-color: #FFFFFF; border: 1px solid #808080; border-top-left-radius: 10px; border-top-right-radius: 10px;'>"; echo "<div id='shortcut_button' style='position: fixed; overflow: hidden; bottom: 0px; left: 0px; width: 185px; height: 40px; background-color: #FFFFFF; border: 1px solid #808080; border-top-left-radius: 10px; border-top-right-radius: 10px;'>";