From 10db67cc7c0d6c6bc374deac1ca805cf4e9b62ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 16 Apr 2018 13:44:42 +0200
Subject: [PATCH] Merge branch
'5816-blacklist-is-not-reset-correctly-for-userattribute' into '1.3-dev'
Resolve "Blacklist is not reset correctly for UserAttribute"
See merge request fusiondirectory/fd!233
(cherry picked from commit c9d6d88b794efff9ffa6da22187cb78859b453fe)
73eca226 :ambulance: fix(UserAttribute) Reset blacklist and whitlist to avoid problems
---
include/simpleplugin/class_dialogAttributes.inc | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/include/simpleplugin/class_dialogAttributes.inc b/include/simpleplugin/class_dialogAttributes.inc
index a35cc1a9c..73f57dd08 100644
--- a/include/simpleplugin/class_dialogAttributes.inc
+++ b/include/simpleplugin/class_dialogAttributes.inc
@@ -94,6 +94,13 @@ class SingleUserSelectDialog extends GenericDialog
{
protected $dialogClass = 'singleUserSelect';
+ function dialog_execute ()
+ {
+ session::set('filterBlacklist', $this->attribute->getFilterBlackList());
+ session::set('filterWhitelist', $this->attribute->getFilterWhiteList());
+ return parent::dialog_execute();
+ }
+
function handle_finish ()
{
$result = $this->dialog->detectPostActions();
@@ -628,6 +635,16 @@ class DialogButtonAttribute extends ButtonAttribute
$this->plugin->openDialog(new $this->dialogClass($this->plugin, $this));
}
}
+
+ function getFilterBlackList ()
+ {
+ return array();
+ }
+
+ function getFilterWhiteList ()
+ {
+ return array();
+ }
}
class UserAttribute extends DialogButtonAttribute
--
GitLab