Release of v5.1.1-alpha2
Adds the ModalSelect fieldtype to Joomla Component Builder - J5. Adds the Data Import Function to the Demo Component. Adds new country related tables and fields to the Demo Component. Resolves the Database Updating issue in the compiler. #1212,#1209. Adds the Component Commands Plugin to the CLI for Import of spreadsheet data-sets.
This commit is contained in:
@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
|
||||
?>
|
||||
<tr class="row<?php echo $i % 2; ?>">
|
||||
<td class="order nowrap center hidden-phone">
|
||||
<?php if ($canDo->get('component_mysql_tweaks.edit.state')): ?>
|
||||
<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit.state')): ?>
|
||||
<?php
|
||||
$iconClass = '';
|
||||
if (!$this->saveOrder)
|
||||
@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="nowrap center">
|
||||
<?php if ($canDo->get('component_mysql_tweaks.edit')): ?>
|
||||
<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit')): ?>
|
||||
<?php if ($item->checked_out) : ?>
|
||||
<?php if ($canCheckin) : ?>
|
||||
<?php echo Html::_('grid.id', $i, $item->id); ?>
|
||||
@ -67,18 +67,34 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
|
||||
</td>
|
||||
<td class="nowrap">
|
||||
<div class="name">
|
||||
<?php if ($canDo->get('component_mysql_tweaks.edit')): ?>
|
||||
<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit')): ?>
|
||||
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->joomla_component_system_name); ?></a>
|
||||
<?php if ($item->checked_out): ?>
|
||||
<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'components_mysql_tweaks.', $canCheckin); ?>
|
||||
<?php endif; ?>
|
||||
<?php else: ?>
|
||||
<?php echo $this->escape($item->joomla_component_system_name); ?>
|
||||
<?php if (!$this->isModal): ?>
|
||||
<?php echo $this->escape($item->joomla_component_system_name); ?>
|
||||
<?php else: ?>
|
||||
<?php
|
||||
$link = "{$edit}&id={$item->id}";
|
||||
$dataId = $item->{$this->getModalTitleKey()} ?? 0;
|
||||
$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->joomla_component_system_name, false) . '</a>';
|
||||
$attribs = 'data-content-select data-content-type="com_componentbuilder.component_mysql_tweaks"'
|
||||
. ' data-id="' . $dataId . '"'
|
||||
. ' data-title="' . $this->escape($item->joomla_component_system_name, false) . '"'
|
||||
. ' data-uri="' . $this->escape($link, false) . '"'
|
||||
. ' data-html="' . $this->escape($itemHtml, false) . '"';
|
||||
?>
|
||||
<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
|
||||
<?php echo $this->escape($item->joomla_component_system_name); ?>
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</td>
|
||||
<td class="center">
|
||||
<?php if ($canDo->get('component_mysql_tweaks.edit.state')) : ?>
|
||||
<?php if (!$this->isModal && $canDo->get('component_mysql_tweaks.edit.state')) : ?>
|
||||
<?php if ($item->checked_out) : ?>
|
||||
<?php if ($canCheckin) : ?>
|
||||
<?php echo Html::_('jgrid.published', $item->published, $i, 'components_mysql_tweaks.', true, 'cb'); ?>
|
||||
|
@ -17,7 +17,7 @@ defined('_JEXEC') or die;
|
||||
|
||||
?>
|
||||
<tr>
|
||||
<?php if ($this->canEdit&& $this->canState): ?>
|
||||
<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
|
||||
<th width="1%" class="nowrap center hidden-phone">
|
||||
<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
|
||||
</th>
|
||||
|
63
admin/tmpl/components_mysql_tweaks/modal.php
Normal file
63
admin/tmpl/components_mysql_tweaks/modal.php
Normal file
@ -0,0 +1,63 @@
|
||||
<?php
|
||||
/**
|
||||
* @package Joomla.Component.Builder
|
||||
*
|
||||
* @created 30th April, 2015
|
||||
* @author Llewellyn van der Merwe <https://dev.vdm.io>
|
||||
* @git Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
|
||||
* @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
|
||||
* @license GNU General Public License version 2 or later; see LICENSE.txt
|
||||
*/
|
||||
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\Language\Text;
|
||||
use Joomla\CMS\Session\Session;
|
||||
use Joomla\CMS\HTML\HTMLHelper as Html;
|
||||
use Joomla\CMS\Layout\LayoutHelper;
|
||||
use Joomla\CMS\Router\Route;
|
||||
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
|
||||
|
||||
// No direct access to this file
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
/** @var \VDM\Component\Componentbuilder\Administrator\View\Components_mysql_tweaks\HtmlView $this */
|
||||
|
||||
$app = Factory::getApplication();
|
||||
|
||||
if ($app->isClient('site')) {
|
||||
Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
|
||||
}
|
||||
|
||||
// dynamic selection of title key (link in modal)
|
||||
$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
|
||||
|
||||
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
|
||||
$wa = $this->getDocument()->getWebAssetManager();
|
||||
$wa->useScript('core')
|
||||
->useScript('multiselect')
|
||||
->useScript('modal-content-select');
|
||||
?>
|
||||
<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=components_mysql_tweaks&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
|
||||
<div id="j-main-container">
|
||||
<?php
|
||||
// Add the trash helper layout
|
||||
echo LayoutHelper::render('trashhelper', $this);
|
||||
// Add the searchtools
|
||||
echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
|
||||
?>
|
||||
<?php if (empty($this->items)): ?>
|
||||
<div class="alert alert-no-items">
|
||||
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
|
||||
</div>
|
||||
<?php else : ?>
|
||||
<table class="table table-striped" id="component_mysql_tweaksList">
|
||||
<thead><?php echo $this->loadTemplate('head');?></thead>
|
||||
<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
|
||||
<tbody><?php echo $this->loadTemplate('body');?></tbody>
|
||||
</table>
|
||||
<input type="hidden" name="boxchecked" value="0" />
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<input type="hidden" name="task" value="" />
|
||||
<?php echo Html::_('form.token'); ?>
|
||||
</form>
|
Reference in New Issue
Block a user