Skip to content

[4.2] contacts - Indicate if category not published #37631

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

Closed
wants to merge 8 commits into from
Closed

[4.2] contacts - Indicate if category not published #37631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1a9247
[4.2] contacts - Indicate if category not published
brianteeman Apr 24, 2022
a959bef
Merge branch '4.2-dev' into checkcontact
brianteeman Apr 26, 2022
aa0b2d2
Merge branch '4.2-dev' into checkcontact
brianteeman Apr 30, 2022
683d36e
Merge tag 'psr12anchor' into psr12/merge/37631
joomla-bot Jun 27, 2022
3b18dbb
Phase 1 convert BRANCH to PSR-12
joomla-bot Jun 27, 2022
9bc371f
Phase 2 convert BRANCH to PSR-12
joomla-bot Jun 27, 2022
66c08dd
Merge tag 'psr12final' into psr12/merge/37631
joomla-bot Jun 27, 2022
be1105c
Merge branch '4.2-dev' into checkcontact
brianteeman Jul 12, 2022
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
1 change: 1 addition & 0 deletions administrator/components/com_contact/src/Model/ContactsModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ protected function getListQuery()

// Join over the categories.
$query->select($db->quoteName('c.title', 'category_title'))
->select($db->quoteName('c.published', 'category_published'))
->join(
'LEFT',
$db->quoteName('#__categories', 'c') . ' ON ' . $db->quoteName('c.id') . ' = ' . $db->quoteName('a.catid')
Expand Down
27 changes: 24 additions & 3 deletions administrator/components/com_contact/tmpl/contacts/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Button\FeaturedButton;
use Joomla\CMS\Button\PublishedButton;
use Joomla\CMS\Factory;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Associations;
Expand Down Expand Up @@ -127,12 +129,28 @@
<?php endif; ?>
</td>
<td class="text-center">
<?php echo HTMLHelper::_('contactadministrator.featured', $item->featured, $i, $canChange); ?>
<?php
$options = [
'task_prefix' => 'contacts.',
'disabled' => !$canChange,
'id' => 'featured-' . $item->id
];

echo (new FeaturedButton())
->render((int) $item->featured, $i, $options);
?>
</td>
<td class="text-center">
<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<?php
$options = [
'task_prefix' => 'contacts.',
'disabled' => !$canChange,
'id' => 'state-' . $item->id,
'category_published' => $item->category_published
];
echo (new PublishedButton())->render((int) $item->published, $i, $options, $item->publish_up, $item->publish_down);
?>
</td>

<th scope="row" class="has-context">
<div>
<?php if ($item->checked_out) : ?>
Expand All @@ -149,6 +167,9 @@
</div>
<div class="small">
<?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
<?php if ($item->category_published < '1') :
echo $item->category_published == '0' ? ' (' . Text::_('JUNPUBLISHED') . ')' : ' (' . Text::_('JTRASHED') . ')';
endif; ?>
</div>
</div>
</th>
Expand Down