felixkat/Component-Builder
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

Resolved gh-598 to allow empty prefix as default.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2020-09-15 18:59:20 +02:00
parent d062e03a04
commit 68769604dd
Signed by untrusted user: Llewellyn
GPG Key ID: EFC0C720A240551C
8 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -144,7 +144,7 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 19th August, 2020 + *Last Build*: 15th September, 2020
+ *Version*: 2.11.6 + *Version*: 2.11.6
+ *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt

2
admin/README.txt
View File

@ -144,7 +144,7 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 19th August, 2020 + *Last Build*: 15th September, 2020
+ *Version*: 2.11.6 + *Version*: 2.11.6
+ *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt

2
admin/config.xml
View File

@ -205,7 +205,7 @@
label="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_LABEL" label="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_LABEL"
size="30" size="30"
maxlength="30" maxlength="30"
default="»" default=""
description="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_DESCRIPTION" description="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_DESCRIPTION"
class="text_area" class="text_area"
filter="SAFEHTML" filter="SAFEHTML"

16
admin/helpers/compiler/e_Interpretation.php
View File

@ -13463,7 +13463,7 @@ class Interpretation extends Fields
$counter++; $counter++;
// add the defaults // add the defaults
$body .= PHP_EOL . $this->_t(2) $body .= PHP_EOL . $this->_t(2)
. "<?php if (\$item->published == 1):?>"; . "<?php if (\$item->published == 1): ?>";
$body .= PHP_EOL . $this->_t(3) . '<td class="center" ' $body .= PHP_EOL . $this->_t(3) . '<td class="center" '
. $data_value . '="1">'; . $data_value . '="1">';
$body .= PHP_EOL . $this->_t(4) $body .= PHP_EOL . $this->_t(4)
@ -13477,7 +13477,7 @@ class Interpretation extends Fields
$body .= PHP_EOL . $this->_t(3) . '</td>'; $body .= PHP_EOL . $this->_t(3) . '</td>';
$body .= PHP_EOL . $this->_t(2) $body .= PHP_EOL . $this->_t(2)
. "<?php elseif (\$item->published == 0):?>"; . "<?php elseif (\$item->published == 0): ?>";
$body .= PHP_EOL . $this->_t(3) . '<td class="center" ' $body .= PHP_EOL . $this->_t(3) . '<td class="center" '
. $data_value . '="2">'; . $data_value . '="2">';
$body .= PHP_EOL . $this->_t(4) $body .= PHP_EOL . $this->_t(4)
@ -13491,7 +13491,7 @@ class Interpretation extends Fields
$body .= PHP_EOL . $this->_t(3) . '</td>'; $body .= PHP_EOL . $this->_t(3) . '</td>';
$body .= PHP_EOL . $this->_t(2) $body .= PHP_EOL . $this->_t(2)
. "<?php elseif (\$item->published == 2):?>"; . "<?php elseif (\$item->published == 2): ?>";
$body .= PHP_EOL . $this->_t(3) . '<td class="center" ' $body .= PHP_EOL . $this->_t(3) . '<td class="center" '
. $data_value . '="3">'; . $data_value . '="3">';
$body .= PHP_EOL . $this->_t(4) $body .= PHP_EOL . $this->_t(4)
@ -13505,7 +13505,7 @@ class Interpretation extends Fields
$body .= PHP_EOL . $this->_t(3) . '</td>'; $body .= PHP_EOL . $this->_t(3) . '</td>';
$body .= PHP_EOL . $this->_t(2) $body .= PHP_EOL . $this->_t(2)
. "<?php elseif (\$item->published == -2):?>"; . "<?php elseif (\$item->published == -2): ?>";
$body .= PHP_EOL . $this->_t(3) . '<td class="center" ' $body .= PHP_EOL . $this->_t(3) . '<td class="center" '
. $data_value . '="4">'; . $data_value . '="4">';
$body .= PHP_EOL . $this->_t(4) $body .= PHP_EOL . $this->_t(4)
@ -13730,8 +13730,6 @@ class Interpretation extends Fields
// set some V3 attr // set some V3 attr
$data_hide = (2 == $this->footableVersion) $data_hide = (2 == $this->footableVersion)
? 'data-hide="phone,tablet"' : 'data-breakpoints="xs sm md"'; ? 'data-hide="phone,tablet"' : 'data-breakpoints="xs sm md"';
$data_type = (2 == $this->footableVersion) ? 'data-type="numeric"'
: 'data-type="number"';
// add the defaults // add the defaults
if (!isset($this->fieldsNames[$viewName_single]['published'])) if (!isset($this->fieldsNames[$viewName_single]['published']))
{ {
@ -13745,6 +13743,8 @@ class Interpretation extends Fields
// add the defaults // add the defaults
if (!isset($this->fieldsNames[$viewName_single]['id'])) if (!isset($this->fieldsNames[$viewName_single]['id']))
{ {
$data_type = (2 == $this->footableVersion) ? 'data-type="numeric"'
: 'data-type="number"';
$head .= PHP_EOL . $this->_t(2) . '<th width="5" ' . $data_type $head .= PHP_EOL . $this->_t(2) . '<th width="5" ' . $data_type
. ' ' . $data_hide . '>'; . ' ' . $data_hide . '>';
$head .= PHP_EOL . $this->_t(3) . "<?php echo JText:" . ":_('" $head .= PHP_EOL . $this->_t(3) . "<?php echo JText:" . ":_('"
@ -13967,7 +13967,9 @@ class Interpretation extends Fields
) )
{ {
if (($order_field_name = $this->getFieldDatabaseName( if (($order_field_name = $this->getFieldDatabaseName(
$viewName_list, $order_field['field'], 'listJoinBuilder' $viewName_list, $order_field['field']
// We Removed This 'listJoinBuilder' as targetArea
// we will keep an eye on this
)) !== false) )) !== false)
{ {
// default ordering is by publish and ordering // default ordering is by publish and ordering

8
admin/layouts/fieldtype/fields_fullwidth.php
View File

@ -124,25 +124,25 @@ $can = ComponentbuilderHelper::getActions('field');
<?php echo $displayData->escape($item->category_title); ?> <?php echo $displayData->escape($item->category_title); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<?php if ($item->published == 1):?> <?php if ($item->published == 1): ?>
<td class="center" data-sort-value="1"> <td class="center" data-sort-value="1">
<span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>"> <span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>
</span> </span>
</td> </td>
<?php elseif ($item->published == 0):?> <?php elseif ($item->published == 0): ?>
<td class="center" data-sort-value="2"> <td class="center" data-sort-value="2">
<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>"> <span class="status-metro status-inactive" title="<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>
</span> </span>
</td> </td>
<?php elseif ($item->published == 2):?> <?php elseif ($item->published == 2): ?>
<td class="center" data-sort-value="3"> <td class="center" data-sort-value="3">
<span class="status-metro status-archived" title="<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>"> <span class="status-metro status-archived" title="<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>
</span> </span>
</td> </td>
<?php elseif ($item->published == -2):?> <?php elseif ($item->published == -2): ?>
<td class="center" data-sort-value="4"> <td class="center" data-sort-value="4">
<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>"> <span class="status-metro status-trashed" title="<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>

8
admin/layouts/server/linked_components_fullwidth.php
View File

@ -217,25 +217,25 @@ else
<?php endif; ?> <?php endif; ?>
</div> </div>
</td> </td>
<?php if ($item->published == 1):?> <?php if ($item->published == 1): ?>
<td class="center" data-sort-value="1"> <td class="center" data-sort-value="1">
<span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>"> <span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>
</span> </span>
</td> </td>
<?php elseif ($item->published == 0):?> <?php elseif ($item->published == 0): ?>
<td class="center" data-sort-value="2"> <td class="center" data-sort-value="2">
<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>"> <span class="status-metro status-inactive" title="<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>
</span> </span>
</td> </td>
<?php elseif ($item->published == 2):?> <?php elseif ($item->published == 2): ?>
<td class="center" data-sort-value="3"> <td class="center" data-sort-value="3">
<span class="status-metro status-archived" title="<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>"> <span class="status-metro status-archived" title="<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>
</span> </span>
</td> </td>
<?php elseif ($item->published == -2):?> <?php elseif ($item->published == -2): ?>
<td class="center" data-sort-value="4"> <td class="center" data-sort-value="4">
<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>"> <span class="status-metro status-trashed" title="<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>">
<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>

2
admin/models/forms/joomla_component.xml
View File

@ -954,7 +954,7 @@
label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_LABEL" label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_LABEL"
size="30" size="30"
maxlength="30" maxlength="30"
default="&amp;#187;" default=""
description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_DESCRIPTION" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_DESCRIPTION"
class="text_area" class="text_area"
filter="SAFEHTML" filter="SAFEHTML"

2
componentbuilder.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2" method="upgrade"> <extension type="component" version="3.2" method="upgrade">
<name>COM_COMPONENTBUILDER</name> <name>COM_COMPONENTBUILDER</name>
<creationDate>19th August, 2020</creationDate> <creationDate>15th September, 2020</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail> <authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl> <authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>