Skip to content

Widgets are visible even if both the plugins tjdatasource & tjdashboa… #30

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

Open
wants to merge 1 commit into
base: release-1.1.1
Choose a base branch
from
Open

Widgets are visible even if both the plugins tjdatasource & tjdashboa… #30

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
39 changes: 38 additions & 1 deletion src/components/com_tjdashboard/administrator/models/widgets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,25 @@ public function __construct($config = array())
*/
protected function getListQuery()
{
// Get ALL the enabled Data plugins
$enabledDataPlugins = JPluginHelper::getPlugin("tjdashboardsource");

// Get ALL the enabled Renderer plugins
$enabledRendererPlugins = JPluginHelper::getPlugin("tjdashboardrenderer");

$regDataEx = array();
$regRendererEx = array();

foreach ($enabledDataPlugins as $plug)
{
$regDataEx[] = "^" . $plug->name;
}

foreach ($enabledRendererPlugins as $replug)
{
$regRendererEx[] = "^" . $replug->name;
}

// Initialize variables.
$db = $this->getDbo();
$query = $db->getQuery(true);
Expand Down Expand Up @@ -100,7 +119,7 @@ protected function getListQuery()
}
elseif ($published === '')
{
$query->where($db->quoteName('wid.state') . ' = 0 OR ' . $db->quoteName('wid.state') . ' = 1');
$query->where($db->quoteName('wid.state') . ' IN (0,1) ');
}

// Filter by size
Expand All @@ -111,6 +130,24 @@ protected function getListQuery()
$query->where($db->quoteName('wid.size') . ' = ' . (int) $size);
}

if (!empty($regDataEx))
{
$query->where($db->quoteName('wid.data_plugin') . " REGEXP '" . implode("|", $regDataEx) . "'");
}
else
{
$query->where($db->quoteName('wid.data_plugin') . " = ''");
}

if (!empty($regRendererEx))
{
$query->where($db->quoteName('wid.renderer_plugin') . " REGEXP '" . implode("|", $regRendererEx) . "'");
}
else
{
$query->where($db->quoteName('wid.renderer_plugin') . " = ''");
}

// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering');
$orderDirn = $this->state->get('list.direction');
Expand Down