From 95bed0fa274268927dce260ec411393207f55a7c Mon Sep 17 00:00:00 2001
From: Janette Day <janette@nucivic.com>
Date: Tue, 12 Dec 2017 18:51:41 -0600
Subject: [PATCH] Fix contextual filter on list_of_users_groups view

Update changelog
---
 CHANGELOG.txt                                                | 1 +
 .../dkan_sitewide_panels.views_default.inc                   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 426f5c0ff8..de249d8d57 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
 7.x-1.14.1
 ----------
+ - #2280 Fix contextual filter on list_of_users_groups view
  - #2263 Fix harvest validation for accessLevel values
  - #2249 Change timezone handling to 'none' on temporal coverage field
  - #2103 Fixed field mapping defaults for open data schema APIs
diff --git a/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.views_default.inc b/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.views_default.inc
index 3cb3f06d6a..3a4739a138 100644
--- a/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.views_default.inc
+++ b/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.views_default.inc
@@ -279,7 +279,7 @@ function dkan_sitewide_panels_views_default_views() {
     'page' => 'page',
   );
   $handler->display->display_options['filters']['type']['group'] = 1;
-  /* Filter criterion: Content: Groups audience (og_group_ref) (reference filter) */
+  /* Filter criterion: Content: Publisher (og_group_ref) (reference filter) */
   $handler->display->display_options['filters']['og_group_ref_target_id_entityreference_filter']['id'] = 'og_group_ref_target_id_entityreference_filter';
   $handler->display->display_options['filters']['og_group_ref_target_id_entityreference_filter']['table'] = 'og_membership';
   $handler->display->display_options['filters']['og_group_ref_target_id_entityreference_filter']['field'] = 'og_group_ref_target_id_entityreference_filter';
@@ -528,7 +528,8 @@ function dkan_sitewide_panels_views_default_views() {
   $handler->display->display_options['arguments']['etid']['field'] = 'etid';
   $handler->display->display_options['arguments']['etid']['ui_name'] = 'We pass the user ID as the Entity ID.';
   $handler->display->display_options['arguments']['etid']['default_action'] = 'default';
-  $handler->display->display_options['arguments']['etid']['default_argument_type'] = 'current_user';
+  $handler->display->display_options['arguments']['etid']['default_argument_type'] = 'user';
+  $handler->display->display_options['arguments']['etid']['default_argument_options']['user'] = FALSE;
   $handler->display->display_options['arguments']['etid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['etid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['etid']['summary_options']['items_per_page'] = '25';