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

Merge branch 'pandora_enterprise#2987' into 'develop' 

Solved errors in mobile events view

See merge request artica/pandorafms!1907

Former-commit-id: 8efb7e917cf6a86b93d9c2905f1c63c292c742e3
This commit is contained in:
Alejandro Fraguas 2019-01-17 11:59:07 +01:00
parent bfecbc5337 65d4c5aab7
commit 80d64f3d6b
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandora_console/mobile/operation/events.php
View File

@ -297,7 +297,7 @@ class Events {
$id_event = $system->getRequest('id_event', 0);
if (events_change_status($id_event, EVENT_VALIDATE)) {
if (events_change_status($id_event, EVENT_VALIDATE,$system->getConfig('metaconsole'))) {
echo json_encode(array('correct' => 1));
}
else {
@ -379,11 +379,20 @@ class Events {
$this->default_filters['severity'] = false;
}
$this->filter = $system->getRequest('filter', __('Preset Filters'));
if (($this->filter === __("Preset Filters")) || ($this->filter == 0)) {
$this->filter = 0;
if ($system->getRequest('filter', __('Preset Filters')) === __("Preset Filters")) {
//Set filter as default user event filter (only first time)
$this->filter = db_get_value('default_event_filter', 'tusuario', 'id_user', $system->getConfig('id_user'));
//Use user set default filter if admin set default filter is "none"
if ($this->filter == 0){
$this->filter = db_get_value('id_filter', 'tusuario', 'id_user', $system->getConfig('id_user'));
}
}
else {
else {
$this->filter = $system->getRequest('filter', __('Preset Filters'));
}
if ($this->filter != 0) {
$this->default = false;
}