manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean the filters for lists linked by SuiteDesk nodes shortcuts

Browse source
This commit is contained in:
Manuel Cillero 2017-09-05 21:27:33 +02:00
parent 1371a4bec5
commit c3e1439b06
11 changed files with 85 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/storm/storm.theme.inc
View file

@ -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);

7
modules/storm/stormdok/stormdok.admin.inc
View file

@ -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';

13
modules/storm/stormevent/stormevent.admin.inc
View file

@ -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';

13
modules/storm/stormexpense/stormexpense.admin.inc
View file

@ -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';

7
modules/storm/storminvoice/storminvoice.admin.inc
View file

@ -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';

7
modules/storm/stormnote/stormnote.admin.inc
View file

@ -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';

10
modules/storm/stormperson/stormperson.admin.inc
View file

@ -9,9 +9,13 @@ function stormperson_list() {
$breadcrumb[] = l(t('Home'), '<front>');
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();

14
modules/storm/stormproject/stormproject.admin.inc
View file

@ -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();

14
modules/storm/stormtask/stormtask.admin.inc
View file

@ -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();

18
modules/storm/stormticket/stormticket.admin.inc
View file

@ -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';

14
modules/storm/stormtimetracking/stormtimetracking.admin.inc
View file

@ -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';