Skip to content

Commit 3701eac

Browse files
committed
J4 filter in backend threw error if no tags defined
J4 insert into editor correction Allow more plugins to pickup settings in main parameters editing within JEvents Clean up our bootstrap methods (e.g. popover) and default to Joomla version when using J4+
1 parent 1851003 commit 3701eac

File tree

10 files changed

+88
-697
lines changed

10 files changed

+88
-697
lines changed

component/admin/assets/js/gslframework.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ window.addEventListener('load', function () {
579579
let options = {};
580580

581581
options.container = "#gslc";
582-
options.title = filter.options[0].innerText;
582+
// tags filter may be empty!
583+
options.title = filter.options.length > 0 ? filter.options[0].innerText : '';
583584

584585
gslUIkit.tooltip(filter, options);
585586

component/admin/layouts/joomla/form/field/radio/buttons.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
use Joomla\CMS\Factory;
1414

1515

16-
if (version_compare(JVERSION, "4", "gt") && Joomla\CMS\Factory::getApplication()->getInput()->getCmd('option', '') == "com_menus")
16+
if (version_compare(JVERSION, "4", "gt")
17+
&& (Joomla\CMS\Factory::getApplication()->getInput()->getCmd('option', '') == "com_menus"
18+
|| Joomla\CMS\Factory::getApplication()->getInput()->getCmd('option', '') == "com_modules")
19+
)
1720
{
1821
include (JPATH_SITE . "/layouts/joomla/form/field/radio/buttons.php");
1922
return;

component/admin/views/icalevent/tmpl/select.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
$this->_largeDataSet = $cfg->get('largeDataSet', 0);
3131
$orderdir = $input->getCmd("filter_order_Dir", 'asc');
3232
$order = $input->getCmd("filter_order", 'start');
33+
$editor = $input->getString('editor');
3334

3435
$document = Factory::getDocument();
3536
$document->addStyleDeclaration("body, input, select, table {font-size:11px;}
@@ -117,7 +118,7 @@
117118
<tr class="row<?php echo $k; ?>">
118119
<td>
119120
<a href="#select"
120-
onclick="return window.parent.<?php echo $function; ?>('<?php echo $link; ?>','<?php echo addslashes(htmlspecialchars($repeat->title())); ?>' , (jQuery('#Itemid').length?jQuery('#Itemid').val():0) , <?php echo $repeat->ev_id(); ?>, <?php echo $repeat->rp_id(); ?>)"
121+
onclick="return window.parent.<?php echo $function; ?>('<?php echo $link; ?>','<?php echo addslashes(htmlspecialchars($repeat->title())); ?>' , (jQuery('#Itemid').length?jQuery('#Itemid').val():0) , <?php echo $repeat->ev_id(); ?>, <?php echo $repeat->rp_id(); ?>, '<?php echo $editor; ?>')"
121122
title="<?php echo Text::_('JEV_SELECT_EVENT'); ?>"><?php echo $row->title(); ?></a>
122123
</td>
123124
<td align="center">

component/admin/views/icalrepeat/tmpl/select.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
$input = Factory::getApplication()->input;
2424

25-
25+
$editor = $input->getString('editor');
2626
$document = Factory::getDocument();
2727
$document->addStyleDeclaration("body, input, select, table {font-size:11px;}
2828
table.filters, table.filters tr,table.filters td {border-width:0px!important;font-size:11px;}
@@ -58,7 +58,7 @@
5858
<tr class="row<?php echo $k; ?>">
5959
<td width="30%">
6060
<a href="#select"
61-
onclick="return window.parent.<?php echo $function; ?>('<?php echo $link; ?>','<?php echo addslashes(htmlspecialchars($repeat->title())); ?>' , (jQuery('#Itemid').length?jQuery('#Itemid').val():0) , <?php echo $repeat->ev_id(); ?>, <?php echo $repeat->rp_id(); ?>)"
61+
onclick="return window.parent.<?php echo $function; ?>('<?php echo $link; ?>','<?php echo addslashes(htmlspecialchars($repeat->title())); ?>' , (jQuery('#Itemid').length?jQuery('#Itemid').val():0) , <?php echo $repeat->ev_id(); ?>, <?php echo $repeat->rp_id(); ?>, '<?php echo $editor; ?>')"
6262
title="<?php echo Text::_('JEV_SELECT_Repeat'); ?>"><?php echo $row->title(); ?></a></td>
6363
<td width="40%">
6464
<?php

component/admin/views/params/tmpl/edit.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
//->where('enabled = 1')
4848
->where('type =' . $db->quote('plugin'))
4949
->where('state IN (0,1)')
50-
->where('(folder="jevents" OR element="gwejson" OR element="jevent_embed")')
50+
->where('(folder="jevents" OR element="gwejson" OR element="jevent_embed" OR element="jevuser" or element="jevcreator" or element="jevents")')
5151
->order('enabled desc, ordering asc');
5252

5353
$jevplugins = $db->setQuery($query)->loadObjectList();

component/site/assets/js/editicalJQ.js

+8
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,14 @@ function setEndDateWhenNotRepeating(elem){
455455
function forceValidDate(elem){
456456
oldDate = new Date();
457457
oldDate = oldDate.dateFromYMD(elem.val());
458+
// if field is cleared then oldDate is empty
459+
if (oldDate == "")
460+
{
461+
oldDate = new Date();
462+
elem.val(oldDate.getYMD());
463+
alert(invalidcorrected);
464+
return;
465+
}
458466
newDate = oldDate.getYMD();
459467
if (newDate!=elem.val()) {
460468
elem.val(newDate);

component/site/jevents.php

+3
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@
325325
//$time_end = (float) $usec + (float) $sec;
326326
//echo "JEvents component pre task = ".round($time_end - $starttime, 4)."<br/>";
327327

328+
//HTMLHelper::_('bootstrap.popover', '.hasjevtip');
329+
JevHtmlBootstrap::popover('.hasjevtip' , array("trigger"=>"hover focus", "placement"=>"top", "delay"=> array( "show"=> 150, "hide"=> 150 )));
330+
328331
// Perform the Request task
329332
$controller->execute($task);
330333

0 commit comments

Comments
 (0)