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

Bug #152417 fix: ActivityStream List view [Backend] : Error message div is empty #47

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

Bug #152417 fix: ActivityStream List view [Backend] : Error message div is empty #47

Show file tree
Hide file tree
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
102 changes: 52 additions & 50 deletions src/admin/views/activities/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

// No direct access to this file
defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;

JHtml::_('formbehavior.chosen', 'select');
$sortFields = $this->getSortFields();
Expand All @@ -22,42 +23,53 @@
?>
</div>
</div>
<table class="table table-striped table-hover">
<thead>
<?php if (!empty($this->items) && empty($this->items['error'])) : ?>
<tr>
<th width="1%" class="hidden-phone">
<input type="checkbox" name="checkall-toggle" value=""
title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_STATE'), 'state', $listDirn, $listOrder); ?>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_TYPE'), 'type', $listDirn, $listOrder);?>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_CREATED_DATE'), 'created_date', $listDirn, $listOrder);?>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_UPDATED_DATE'), 'updated_date', $listDirn, $listOrder);?>
</th>
<th width="2%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_ID'), 'id', $listDirn, $listOrder); ?>
<?php
if (empty($this->items))
{
?>
<div class="clearfix">&nbsp;</div>

<div class="alert alert-no-items">
<?php echo Text::_('COM_ACTIVITYSTREAM_NO_ACTIVITY');?>
</div>
<?php
}
elseif (!empty($this->items) && empty($this->items['error']))
{
?>
<table class="table table-striped table-hover">
<thead>
<tr>
<th width="1%" class="hidden-phone">
<input type="checkbox" name="checkall-toggle" value=""
title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_STATE'), 'state', $listDirn, $listOrder); ?>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_TYPE'), 'type', $listDirn, $listOrder);?>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_CREATED_DATE'), 'created_date', $listDirn, $listOrder);?>
</th>
<th width="5%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_UPDATED_DATE'), 'updated_date', $listDirn, $listOrder);?>
</th>
<th width="2%">
<?php echo JHtml::_('searchtools.sort', JText::_('COM_ACTIVITYSTREAM_ACTIVITY_ID'), 'id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="6">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</th>
</tr>
<?php endif;?>
</thead>
<tfoot>
<tr>
<td colspan="6">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</th>
</tr>
</tfoot>
<tbody>
<?php if (!empty($this->items) && empty($this->items['error'])) : ?>
</tr>
</tfoot>
<tbody>
<?php foreach ($this->items as $i => $row) :
$link = JRoute::_('index.php?option=com_activitystream&task=activity.edit&id=' . $row->id);
?>
Expand All @@ -84,21 +96,11 @@
</td>
</tr>
<?php endforeach; ?>
<?php else: ?>
<div>&nbsp;</div>
<div class="alert alert-error">
<div>
<?php
if (!empty($this->items['message']))
{
echo $this->items['message'];
}
?>
</div>
</div>
<?php endif;?>
</tbody>
</table>
</tbody>
</table>
<?php
}
?>
<input type="hidden" name="task" value=""/>
<input type="hidden" name="boxchecked" value="0"/>
<?php echo JHtml::_('form.token'); ?>
Expand Down
1 change: 1 addition & 0 deletions src/admin/views/activities/view.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ protected function addToolBar()
JToolBarHelper::publish('activity.publish');
JToolBarHelper::unpublish('activity.publish');
JToolBarHelper::deleteList('', 'activities.delete');
JToolBarHelper::preferences('com_activitystream');
}

/**
Expand Down