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

[FIX][4.0] An error has occurred on Search Filter #23679

Merged
merged 28 commits into from
Mar 2, 2019
Merged

[FIX][4.0] An error has occurred on Search Filter #23679

Changes from 7 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5517fa5
fix
amitranjan2 Jan 26, 2019
c5ee1db
fix
amitranjan2 Jan 26, 2019
6be7785
fix
amitranjan2 Jan 26, 2019
eb4b945
Merge branch '4.0-dev' into text
amitranjan2 Jan 26, 2019
af441cd
Merge branch '4.0-dev' into text
amitranjan2 Jan 28, 2019
05cd275
Update default.php
amitranjan2 Jan 29, 2019
8486865
Merge branch '4.0-dev' into text
amitranjan2 Jan 29, 2019
4f02040
Update administrator/components/com_finder/tmpl/filters/default.php
Jan 29, 2019
738d0ae
Merge branch '4.0-dev' into text
amitranjan2 Jan 30, 2019
d09fd04
Merge branch '4.0-dev' into text
amitranjan2 Jan 30, 2019
bcf8cef
Merge branch '4.0-dev' into text
amitranjan2 Jan 30, 2019
b070e5c
Merge branch '4.0-dev' into text
amitranjan2 Jan 31, 2019
341e0de
Merge branch '4.0-dev' into text
amitranjan2 Feb 1, 2019
3acbe64
Merge branch '4.0-dev' into text
amitranjan2 Feb 2, 2019
4f6b7ab
Merge branch '4.0-dev' into text
amitranjan2 Feb 4, 2019
e08e9be
Merge branch '4.0-dev' into text
amitranjan2 Feb 6, 2019
f00491a
Merge branch '4.0-dev' into text
amitranjan2 Feb 8, 2019
cf69609
Merge branch '4.0-dev' into text
amitranjan2 Feb 9, 2019
dad954b
Merge branch '4.0-dev' into text
infograf768 Feb 13, 2019
cf73205
Merge branch '4.0-dev' into text
amitranjan2 Feb 13, 2019
c4ab203
Merge branch '4.0-dev' into text
amitranjan2 Feb 15, 2019
007585b
Merge branch '4.0-dev' into text
amitranjan2 Feb 18, 2019
af24315
Merge branch '4.0-dev' into text
amitranjan2 Feb 23, 2019
2eea53b
Merge branch '4.0-dev' into text
amitranjan2 Feb 24, 2019
67d4ab1
Merge branch '4.0-dev' into text
amitranjan2 Feb 25, 2019
fa04d7a
Merge branch '4.0-dev' into text
amitranjan2 Feb 28, 2019
7b1100e
Merge branch '4.0-dev' into text
amitranjan2 Feb 28, 2019
ca839b1
Merge branch '4.0-dev' into text
amitranjan2 Mar 2, 2019
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
40 changes: 22 additions & 18 deletions administrator/components/com_finder/tmpl/filters/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,31 @@

defined('_JEXEC') or die;

use Joomla\CMS\Factory;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper
use Joomla\CMS\Router\Route;

$user = JFactory::getUser();
$user = Factory::getUser();
$userId = $user->get('id');
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));

JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
Text::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
HTMLHelper::_('script', 'com_finder/filters.js', ['version' => 'auto', 'relative' => true]);
?>
<form action="<?php echo JRoute::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
<form action="<?php echo Route::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div id="j-main-container" class="j-main-container">
<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-warning">
<?php echo JText::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
<?php echo Text::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
</div>
<?php else : ?>
<table class="table">
Expand All @@ -39,25 +43,25 @@
<thead>
<tr>
<td style="width:1%" class="text-center">
<?php echo JHtml::_('grid.checkall'); ?>
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" style="width:1%">
<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
</th>
<th scope="col">
<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
</th>
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
</th>
<th scope="col" style="width:10%" class="d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
</th>
<th scope="col" style="width:5%" class="d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
</th>
<th scope="col" style="width:1%" class="d-none d-md-table-cell">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
Expand All @@ -75,17 +79,17 @@
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="text-center">
<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
<?php echo HTMLHelper::_('grid.id', $i, $item->filter_id); ?>
</td>
<td class="text-center">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
<?php echo HTMLHelper::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
</td>
<th scope="row">
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
<?php endif; ?>
<?php if ($canEdit) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
<a href="<?php echo Route::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
<?php echo $escapedTitle; ?></a>
<?php else : ?>
<?php echo $escapedTitle; ?>
Expand All @@ -95,7 +99,7 @@
<?php echo $item->created_by_alias ?: $item->user_name; ?>
</td>
<td class="d-none d-md-table-cell">
<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
<?php echo HTMLHelper::_('date', $item->created, Text::_('DATE_FORMAT_LC4')); ?>
</td>
<td class="d-none d-md-table-cell">
<?php echo $item->map_count; ?>
Expand All @@ -114,7 +118,7 @@
<?php endif; ?>
<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
<?php echo JHtml::_('form.token'); ?>
<?php echo HTMLHelper::_('form.token'); ?>
</div>
</div>
</div>
Expand Down