Commit c9d6d88b authored by Côme Chilliet's avatar Côme Chilliet
Browse files

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
Showing with 17 additions and 0 deletions
+17 -0
...@@ -102,6 +102,13 @@ class SingleUserSelectDialog extends GenericDialog ...@@ -102,6 +102,13 @@ class SingleUserSelectDialog extends GenericDialog
{ {
protected $dialogClass = 'singleUserSelect'; 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 () function handle_finish ()
{ {
$result = $this->dialog->detectPostActions(); $result = $this->dialog->detectPostActions();
...@@ -706,6 +713,16 @@ class DialogButtonAttribute extends ButtonAttribute ...@@ -706,6 +713,16 @@ class DialogButtonAttribute extends ButtonAttribute
$this->plugin->openDialog(new $this->dialogClass($this->plugin, $this)); $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this));
} }
} }
function getFilterBlackList ()
{
return array();
}
function getFilterWhiteList ()
{
return array();
}
} }
/*! /*!
......
  • bmortier @bmortier

    mentioned in commit 10db67cc

    By Côme Chilliet on 2018-07-19T13:32:46 (imported from GitLab)

    ·

    mentioned in commit 10db67cc

    By Côme Chilliet on 2018-07-19T13:32:46 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in merge request !342

    By Côme Chilliet on 2018-07-19T13:33:08 (imported from GitLab)

    ·

    mentioned in merge request !342

    By Côme Chilliet on 2018-07-19T13:33:08 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in commit 4421507c

    By Côme Chilliet on 2018-07-19T13:44:20 (imported from GitLab)

    ·

    mentioned in commit 4421507c

    By Côme Chilliet on 2018-07-19T13:44:20 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment