From 6a9423006b77304b79e78e3f87aade9a9d8ba0a3 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Mon, 18 Sep 2017 17:55:57 +0200
Subject: [PATCH] Reverted previous modified code fixing access permissions in
 lists

---
 modules/storm/stormdok/stormdok.admin.inc       | 7 ++++++-
 modules/storm/stormidea/stormidea.admin.inc     | 2 --
 modules/storm/stormnote/stormnote.admin.inc     | 7 ++++++-
 modules/storm/stormperson/stormperson.admin.inc | 7 ++++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/modules/storm/stormdok/stormdok.admin.inc b/modules/storm/stormdok/stormdok.admin.inc
index 687b82f..300187c 100644
--- a/modules/storm/stormdok/stormdok.admin.inc
+++ b/modules/storm/stormdok/stormdok.admin.inc
@@ -39,6 +39,11 @@ function stormdok_list() {
   $i = new stdClass();
   $i->type = 'stormdok';
 
+  $params = $_GET;
+  if (isset($_SESSION['stormdok_list_filter']['organization_nid'])) {
+    $params['organization_nid'] = $_SESSION['stormdok_list_filter']['organization_nid'];
+  }
+
   $header = array(
     array(
       'data' => ' ',
@@ -71,7 +76,7 @@ function stormdok_list() {
       'class' => 'storm_list_version',
     ),
     array(
-      'data' => storm_icon_add_node($i, $_GET),
+      'data' => storm_icon_add_node($i, $params),
       'class' => 'storm_list_operations',
     ),
   );
diff --git a/modules/storm/stormidea/stormidea.admin.inc b/modules/storm/stormidea/stormidea.admin.inc
index 49fcfc7..c2f7c5c 100644
--- a/modules/storm/stormidea/stormidea.admin.inc
+++ b/modules/storm/stormidea/stormidea.admin.inc
@@ -12,8 +12,6 @@ function stormidea_list() {
   $i = new stdClass();
   $i->type = 'stormidea';
 
-  $params = $_GET;
-
   $header = array(
     array(
       'data' => t('Idea'),
diff --git a/modules/storm/stormnote/stormnote.admin.inc b/modules/storm/stormnote/stormnote.admin.inc
index 77f06f5..cc51f9f 100644
--- a/modules/storm/stormnote/stormnote.admin.inc
+++ b/modules/storm/stormnote/stormnote.admin.inc
@@ -39,6 +39,11 @@ function stormnote_list() {
   $i = new stdClass();
   $i->type = 'stormnote';
 
+  $params = $_GET;
+  if (isset($_SESSION['stormnote_list_filter']['organization_nid'])) {
+    $params['organization_nid'] = $_SESSION['stormnote_list_filter']['organization_nid'];
+  }
+
   $header = array(
     array(
       'data' => t('Title') . ' / ' . t('Organization') . ' » ' . t('Project') . ' » ' . t('Task'),
@@ -64,7 +69,7 @@ function stormnote_list() {
       'class' => 'storm_list_version',
     ),
     array(
-      'data' => storm_icon_add_node($i, $_GET),
+      'data' => storm_icon_add_node($i, $params),
       'class' => 'storm_list_operations',
     ),
   );
diff --git a/modules/storm/stormperson/stormperson.admin.inc b/modules/storm/stormperson/stormperson.admin.inc
index f427de4..0421bfe 100644
--- a/modules/storm/stormperson/stormperson.admin.inc
+++ b/modules/storm/stormperson/stormperson.admin.inc
@@ -21,6 +21,11 @@ function stormperson_list() {
   $i = new stdClass();
   $i->type = 'stormperson';
 
+  $params = $_GET;
+  if (isset($_SESSION['stormperson_list_filter']['organization_nid'])) {
+    $params['organization_nid'] = $_SESSION['stormperson_list_filter']['organization_nid'];
+  }
+
   $header = array(
     array(
       'data' => t('Organization'),
@@ -35,7 +40,7 @@ function stormperson_list() {
       'field' => 'spe.email',
     ),
     array(
-      'data' => storm_icon_add_node($i, $_GET),
+      'data' => storm_icon_add_node($i, $params),
       'class' => 'storm_list_operations',
     ),
   );