Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import preview should display data correctly with Black/Whitelisting #1825

Merged
merged 1 commit into from
Apr 9, 2019
Merged

Import preview should display data correctly with Black/Whitelisting #1825

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions library/Director/Web/Table/ImportsourceHookTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ class ImportsourceHookTable extends SimpleQueryBasedTable
/** @var ImportSource */
protected $source;

protected $dataCache;

protected $columnCache;

protected $sourceHook;
Expand Down Expand Up @@ -97,19 +95,12 @@ protected function sourceHook()
return $this->sourceHook;
}

public function fetchQueryRows()
{
if ($this->dataCache === null) {
$this->dataCache = parent::fetchQueryRows();
$this->source->applyModifiers($this->dataCache);
}

return $this->dataCache;
}

public function prepareQuery()
{
$ds = new ArrayDatasource($this->sourceHook()->fetchData());
$data = $this->sourceHook()->fetchData();
$this->source->applyModifiers($data);

$ds = new ArrayDatasource($data);
return $ds->select();
}
}