From c3e1439b06a4780a441db443450333600ad35108 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Tue, 5 Sep 2017 21:27:33 +0200 Subject: [PATCH] Clean the filters for lists linked by SuiteDesk nodes shortcuts --- modules/storm/storm.theme.inc | 2 +- modules/storm/stormdok/stormdok.admin.inc | 7 +++---- modules/storm/stormevent/stormevent.admin.inc | 13 +++++++++---- .../storm/stormexpense/stormexpense.admin.inc | 13 +++++++------ .../storm/storminvoice/storminvoice.admin.inc | 7 ++++++- modules/storm/stormnote/stormnote.admin.inc | 7 +++---- .../storm/stormperson/stormperson.admin.inc | 10 +++++++--- .../storm/stormproject/stormproject.admin.inc | 14 ++++++++++++++ modules/storm/stormtask/stormtask.admin.inc | 14 +++++++++++++- .../storm/stormticket/stormticket.admin.inc | 18 ++++++++++++++---- .../stormtimetracking.admin.inc | 14 ++++++++------ 11 files changed, 85 insertions(+), 34 deletions(-) diff --git a/modules/storm/storm.theme.inc b/modules/storm/storm.theme.inc index d33efcf..0401d22 100644 --- a/modules/storm/storm.theme.inc +++ b/modules/storm/storm.theme.inc @@ -404,7 +404,7 @@ function theme_storm_link($source_module='', $destination_module='', $node_nid=0 $params = array(); } else { - $params = array('query' => array($params_key => $node_nid)); + $params = array('query' => array($params_key => $node_nid, 'view' => 'all')); } $v = l($list_text, $list_path, $params); diff --git a/modules/storm/stormdok/stormdok.admin.inc b/modules/storm/stormdok/stormdok.admin.inc index e3a1755..9bdb473 100644 --- a/modules/storm/stormdok/stormdok.admin.inc +++ b/modules/storm/stormdok/stormdok.admin.inc @@ -16,26 +16,25 @@ function stormdok_list() { unset($_SESSION['stormdok_list_filter']['project_nid']); unset($_SESSION['stormdok_list_filter']['task_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['stormdok_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['stormdok_list_filter']['project_nid'] = $_GET['project_nid']; } $p = node_load($_GET['project_nid']); $_SESSION['stormdok_list_filter']['organization_nid'] = $p->organization_nid; - unset($_SESSION['stormdok_list_filter']['task_nid']); } - if (array_key_exists('task_nid', $_GET)) { if ($_SESSION['stormdok_list_filter']['task_nid'] != $_GET['task_nid']) { $_SESSION['stormdok_list_filter']['task_nid'] = $_GET['task_nid']; } - $t = node_load($_GET['task_nid']); $_SESSION['stormdok_list_filter']['organization_nid'] = $t->organization_nid; $_SESSION['stormdok_list_filter']['project_nid'] = $t->project_nid; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + $_SESSION['stormdok_list_filter']['title'] = ''; + } $i = new stdClass(); $i->type = 'stormdok'; diff --git a/modules/storm/stormevent/stormevent.admin.inc b/modules/storm/stormevent/stormevent.admin.inc index b3ab6f9..e6d0b71 100644 --- a/modules/storm/stormevent/stormevent.admin.inc +++ b/modules/storm/stormevent/stormevent.admin.inc @@ -16,26 +16,31 @@ function stormevent_list() { unset($_SESSION['stormevent_list_filter']['project_nid']); unset($_SESSION['stormevent_list_filter']['task_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['stormevent_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['stormevent_list_filter']['project_nid'] = $_GET['project_nid']; } $p = node_load($_GET['project_nid']); $_SESSION['stormevent_list_filter']['organization_nid'] = $p->organization_nid; - unset($_SESSION['stormevent_list_filter']['task_nid']); } - if (array_key_exists('task_nid', $_GET)) { if ($_SESSION['stormevent_list_filter']['task_nid'] != $_GET['task_nid']) { $_SESSION['stormevent_list_filter']['task_nid'] = $_GET['task_nid']; } - $t = node_load($_GET['task_nid']); $_SESSION['stormevent_list_filter']['organization_nid'] = $t->organization_nid; $_SESSION['stormevent_list_filter']['project_nid'] = $t->project_nid; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + $_SESSION['stormevent_list_filter']['eventtype'] = '-'; + $_SESSION['stormevent_list_filter']['title'] = ''; + + unset($_SESSION['stormevent_list_filter']['datebeginfrom']); + unset($_SESSION['stormevent_list_filter']['datebeginto']); + unset($_SESSION['stormevent_list_filter']['dateendfrom']); + unset($_SESSION['stormevent_list_filter']['dateendto']); + } $i = new stdClass(); $i->type = 'stormevent'; diff --git a/modules/storm/stormexpense/stormexpense.admin.inc b/modules/storm/stormexpense/stormexpense.admin.inc index e131aa9..54c4f81 100644 --- a/modules/storm/stormexpense/stormexpense.admin.inc +++ b/modules/storm/stormexpense/stormexpense.admin.inc @@ -17,39 +17,40 @@ function stormexpense_list() { unset($_SESSION['stormexpense_list_filter']['task_nid']); unset($_SESSION['stormexpense_list_filter']['ticket_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['stormexpense_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['stormexpense_list_filter']['project_nid'] = $_GET['project_nid']; } $p = node_load($_GET['project_nid']); $_SESSION['stormexpense_list_filter']['organization_nid'] = $p->organization_nid; - unset($_SESSION['stormexpense_list_filter']['task_nid']); unset($_SESSION['stormexpense_list_filter']['ticket_nid']); } - if (array_key_exists('task_nid', $_GET)) { if ($_SESSION['stormexpense_list_filter']['task_nid'] != $_GET['task_nid']) { $_SESSION['stormexpense_list_filter']['task_nid'] = $_GET['task_nid']; } - $t = node_load($_GET['task_nid']); $_SESSION['stormexpense_list_filter']['organization_nid'] = $t->organization_nid; $_SESSION['stormexpense_list_filter']['project_nid'] = $t->project_nid; unset($_SESSION['stormexpense_list_filter']['ticket_nid']); } - if (array_key_exists('ticket_nid', $_GET)) { if ($_SESSION['stormexpense_list_filter']['ticket_nid'] != $_GET['ticket_nid']) { $_SESSION['stormexpense_list_filter']['ticket_nid'] = $_GET['ticket_nid']; } - $ti = node_load($_GET['ticket_nid']); $_SESSION['stormexpense_list_filter']['organization_nid'] = $ti->organization_nid; $_SESSION['stormexpense_list_filter']['project_nid'] = $ti->project_nid; $_SESSION['stormexpense_list_filter']['task_nid'] = $ti->task_nid; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + unset($_SESSION['stormexpense_list_filter']['datefrom']); + + $_SESSION['stormexpense_list_filter']['user'] = ''; + $_SESSION['stormexpense_list_filter']['title'] = ''; + $_SESSION['stormexpense_list_filter']['provider_title'] = ''; + } $i = new stdClass(); $i->type = 'stormexpense'; diff --git a/modules/storm/storminvoice/storminvoice.admin.inc b/modules/storm/storminvoice/storminvoice.admin.inc index e127042..8e2f788 100644 --- a/modules/storm/storminvoice/storminvoice.admin.inc +++ b/modules/storm/storminvoice/storminvoice.admin.inc @@ -15,7 +15,6 @@ function storminvoice_list() { } unset($_SESSION['storminvoice_list_filter']['project_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['storminvoice_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['storminvoice_list_filter']['project_nid'] = $_GET['project_nid']; @@ -23,6 +22,12 @@ function storminvoice_list() { $p = node_load($_GET['project_nid']); $_SESSION['storminvoice_list_filter']['organization_nid'] = $p->organization_nid; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + unset($_SESSION['storminvoice_list_filter']['reqdatefrom']); + unset($_SESSION['storminvoice_list_filter']['reqdateto']); + + $_SESSION['storminvoice_list_filter']['status'] = ''; + } $i = new stdClass(); $i->type = 'storminvoice'; diff --git a/modules/storm/stormnote/stormnote.admin.inc b/modules/storm/stormnote/stormnote.admin.inc index c201d12..b243bbe 100644 --- a/modules/storm/stormnote/stormnote.admin.inc +++ b/modules/storm/stormnote/stormnote.admin.inc @@ -16,26 +16,25 @@ function stormnote_list() { unset($_SESSION['stormnote_list_filter']['project_nid']); unset($_SESSION['stormnote_list_filter']['task_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['stormnote_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['stormnote_list_filter']['project_nid'] = $_GET['project_nid']; } $p = node_load($_GET['project_nid']); $_SESSION['stormnote_list_filter']['organization_nid'] = $p->organization_nid; - unset($_SESSION['stormnote_list_filter']['task_nid']); } - if (array_key_exists('task_nid', $_GET)) { if ($_SESSION['stormnote_list_filter']['task_nid'] != $_GET['task_nid']) { $_SESSION['stormnote_list_filter']['task_nid'] = $_GET['task_nid']; } - $t = node_load($_GET['task_nid']); $_SESSION['stormnote_list_filter']['organization_nid'] = $t->organization_nid; $_SESSION['stormnote_list_filter']['project_nid'] = $t->project_nid; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + $_SESSION['stormnote_list_filter']['title'] = ''; + } $i = new stdClass(); $i->type = 'stormnote'; diff --git a/modules/storm/stormperson/stormperson.admin.inc b/modules/storm/stormperson/stormperson.admin.inc index ab72608..bfdc35e 100644 --- a/modules/storm/stormperson/stormperson.admin.inc +++ b/modules/storm/stormperson/stormperson.admin.inc @@ -9,9 +9,13 @@ function stormperson_list() { $breadcrumb[] = l(t('Home'), ''); drupal_set_breadcrumb($breadcrumb); - if (array_key_exists('organization_nid', $_GET) && - ($_SESSION['stormperson_list_filter']['organization_nid'] != $_GET['organization_nid'])) { - $_SESSION['stormperson_list_filter']['organization_nid'] = $_GET['organization_nid']; + if (array_key_exists('organization_nid', $_GET)) { + if ($_SESSION['stormperson_list_filter']['organization_nid'] != $_GET['organization_nid']) { + $_SESSION['stormperson_list_filter']['organization_nid'] = $_GET['organization_nid']; + } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + $_SESSION['stormperson_list_filter']['name'] = ''; + } } $i = new stdClass(); diff --git a/modules/storm/stormproject/stormproject.admin.inc b/modules/storm/stormproject/stormproject.admin.inc index dd31581..43f3e34 100644 --- a/modules/storm/stormproject/stormproject.admin.inc +++ b/modules/storm/stormproject/stormproject.admin.inc @@ -13,6 +13,20 @@ function stormproject_list() { if ($_SESSION['stormproject_list_filter']['organization_nid'] != $_GET['organization_nid']) { $_SESSION['stormproject_list_filter']['organization_nid'] = $_GET['organization_nid']; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + $_SESSION['stormproject_list_filter']['projectcategory'] = '-'; + $_SESSION['stormproject_list_filter']['projectstatus'] = '-'; + $_SESSION['stormproject_list_filter']['projectpriority'] = '-'; + + unset($_SESSION['stormproject_list_filter']['datebeginfrom']); + unset($_SESSION['stormproject_list_filter']['datebeginto']); + unset($_SESSION['stormproject_list_filter']['dateendfrom']); + unset($_SESSION['stormproject_list_filter']['dateendto']); + unset($_SESSION['stormproject_list_filter']['assigned_to']); + + $_SESSION['stormproject_list_filter']['billable'] = '-'; + $_SESSION['stormproject_list_filter']['billed'] = '-'; + } } $i = new stdClass(); diff --git a/modules/storm/stormtask/stormtask.admin.inc b/modules/storm/stormtask/stormtask.admin.inc index e2d8b9e..7608157 100644 --- a/modules/storm/stormtask/stormtask.admin.inc +++ b/modules/storm/stormtask/stormtask.admin.inc @@ -526,14 +526,26 @@ function stormtask_list() { } unset($_SESSION['stormtask_list_filter']['project_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['stormtask_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['stormtask_list_filter']['project_nid'] = $_GET['project_nid']; } $p = node_load($_GET['project_nid']); $_SESSION['stormtask_list_filter']['organization_nid'] = $p->organization_nid; + } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + $_SESSION['stormtask_list_filter']['taskcategory'] = '-'; + $_SESSION['stormtask_list_filter']['taskstatus'] = '-'; + $_SESSION['stormtask_list_filter']['taskpriority'] = '-'; + unset($_SESSION['stormtask_list_filter']['datebeginfrom']); + unset($_SESSION['stormtask_list_filter']['datebeginto']); + unset($_SESSION['stormtask_list_filter']['dateendfrom']); + unset($_SESSION['stormtask_list_filter']['dateendto']); + unset($_SESSION['stormtask_list_filter']['assigned_to']); + + $_SESSION['stormtask_list_filter']['billable'] = '-'; + $_SESSION['stormtask_list_filter']['billed'] = '-'; } $i = new stdClass(); diff --git a/modules/storm/stormticket/stormticket.admin.inc b/modules/storm/stormticket/stormticket.admin.inc index 1d6619d..a340b73 100644 --- a/modules/storm/stormticket/stormticket.admin.inc +++ b/modules/storm/stormticket/stormticket.admin.inc @@ -19,26 +19,36 @@ function stormticket_list() { unset($_SESSION['stormticket_list_filter']['project_nid']); unset($_SESSION['stormticket_list_filter']['task_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['stormticket_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['stormticket_list_filter']['project_nid'] = $_GET['project_nid']; } $p = node_load($_GET['project_nid']); $_SESSION['stormticket_list_filter']['organization_nid'] = $p->organization_nid; - unset($_SESSION['stormticket_list_filter']['task_nid']); } - if (array_key_exists('task_nid', $_GET)) { if ($_SESSION['stormticket_list_filter']['task_nid'] != $_GET['task_nid']) { $_SESSION['stormticket_list_filter']['task_nid'] = $_GET['task_nid']; } - $t = node_load($_GET['task_nid']); $_SESSION['stormticket_list_filter']['organization_nid'] = $t->organization_nid; $_SESSION['stormticket_list_filter']['project_nid'] = $t->project_nid; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + $_SESSION['stormticket_list_filter']['ticketcategory'] = '-'; + $_SESSION['stormticket_list_filter']['ticketstatus'] = '-'; + $_SESSION['stormticket_list_filter']['ticketpriority'] = '-'; + + unset($_SESSION['stormticket_list_filter']['datebeginfrom']); + unset($_SESSION['stormticket_list_filter']['datebeginto']); + unset($_SESSION['stormticket_list_filter']['dateendfrom']); + unset($_SESSION['stormticket_list_filter']['dateendto']); + unset($_SESSION['stormticket_list_filter']['assigned_to']); + + $_SESSION['stormticket_list_filter']['billable'] = '-'; + $_SESSION['stormticket_list_filter']['billed'] = '-'; + } $i = new stdClass(); $i->type = 'stormticket'; diff --git a/modules/storm/stormtimetracking/stormtimetracking.admin.inc b/modules/storm/stormtimetracking/stormtimetracking.admin.inc index cb354ed..2baacca 100644 --- a/modules/storm/stormtimetracking/stormtimetracking.admin.inc +++ b/modules/storm/stormtimetracking/stormtimetracking.admin.inc @@ -17,39 +17,41 @@ function stormtimetracking_list() { unset($_SESSION['stormtimetracking_list_filter']['task_nid']); unset($_SESSION['stormtimetracking_list_filter']['ticket_nid']); } - if (array_key_exists('project_nid', $_GET)) { if ($_SESSION['stormtimetracking_list_filter']['project_nid'] != $_GET['project_nid']) { $_SESSION['stormtimetracking_list_filter']['project_nid'] = $_GET['project_nid']; } $p = node_load($_GET['project_nid']); $_SESSION['stormtimetracking_list_filter']['organization_nid'] = $p->organization_nid; - unset($_SESSION['stormtimetracking_list_filter']['task_nid']); unset($_SESSION['stormtimetracking_list_filter']['ticket_nid']); } - if (array_key_exists('task_nid', $_GET)) { if ($_SESSION['stormtimetracking_list_filter']['task_nid'] != $_GET['task_nid']) { $_SESSION['stormtimetracking_list_filter']['task_nid'] = $_GET['task_nid']; } - $t = node_load($_GET['task_nid']); $_SESSION['stormtimetracking_list_filter']['organization_nid'] = $t->organization_nid; $_SESSION['stormtimetracking_list_filter']['project_nid'] = $t->project_nid; unset($_SESSION['stormtimetracking_list_filter']['ticket_nid']); } - if (array_key_exists('ticket_nid', $_GET)) { if ($_SESSION['stormtimetracking_list_filter']['ticket_nid'] != $_GET['ticket_nid']) { $_SESSION['stormtimetracking_list_filter']['ticket_nid'] = $_GET['ticket_nid']; } - $ti = node_load($_GET['ticket_nid']); $_SESSION['stormtimetracking_list_filter']['organization_nid'] = $ti->organization_nid; $_SESSION['stormtimetracking_list_filter']['project_nid'] = $ti->project_nid; $_SESSION['stormtimetracking_list_filter']['task_nid'] = $ti->task_nid; } + if (array_key_exists('view', $_GET) && $_GET['view'] == 'all') { + unset($_SESSION['stormtimetracking_list_filter']['datefrom']); + unset($_SESSION['stormtimetracking_list_filter']['dateto']); + + $_SESSION['stormtimetracking_list_filter']['user'] = ''; + $_SESSION['stormtimetracking_list_filter']['billable'] = '-'; + $_SESSION['stormtimetracking_list_filter']['billed'] = '-'; + } $i = new stdClass(); $i->type = 'stormtimetracking';