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

Jump to bottom

Fix display of data-function #38959

Merged
merged 9 commits into from
Feb 22, 2023
Merged

Fix display of data-function #38959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8746bdb
Fix display of data-function
chmst Oct 14, 2022
c0ed3d3
Update administrator/components/com_modules/tmpl/select/default.php
chmst Oct 14, 2022
aa6789a
Indent correctly, add space
chmst Oct 14, 2022
a081ddc
Remove modal fromscheduler select view
chmst Oct 15, 2022
e6e54fb
Merge branch '4.2-dev' into fix-data-function
chmst Oct 25, 2022
ba940f6
Merge branch '4.2-dev' into fix-data-function
Quy Jan 19, 2023
ca16170
add toolbar
chmst Jan 20, 2023
3b1d91f
Merge branch '4.2-dev' into fix-data-function
Quy Jan 23, 2023
e957027
Merge branch '4.2-dev' into fix-data-function
Quy Feb 6, 2023
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
4 changes: 3 additions & 1 deletion administrator/components/com_modules/tmpl/select/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ class="form-control" id="comModulesSelectSearch"
<?php $link = 'index.php?option=com_modules&task=module.add&client_id=' . $this->state->get('client_id', 0) . $this->modalLink . '&eid=' . $item->extension_id; ?>
<?php $name = $this->escape($item->name); ?>
<?php $desc = HTMLHelper::_('string.truncate', $this->escape(strip_tags($item->desc)), 200); ?>
<a href="<?php echo Route::_($link); ?>" class="new-module mb-3 comModulesSelectCard" data-function="' . $this->escape($function) : ''; ?>" aria-label="<?php echo Text::sprintf('COM_MODULES_SELECT_MODULE', $name); ?>">
<a href="<?php echo Route::_($link); ?>" class="new-module mb-3 comModulesSelectCard"
<?php echo !empty($function) ? 'data-function="' . $this->escape($function) . '"': '' ;?>
chmst marked this conversation as resolved.
Show resolved Hide resolved
aria-label="<?php echo Text::sprintf('COM_MODULES_SELECT_MODULE', $name); ?>">
<div class="new-module-details">
<h3 class="new-module-title"><?php echo $name; ?></h3>
<p class="card-body new-module-caption p-0">
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_scheduler/tmpl/select/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php $desc = HTMLHelper::_('string.truncate', $this->escape(strip_tags($item->desc)), 200); ?>
<!-- The task card begins -->
<a href="<?php echo Route::_($link); ?>" class="new-task mb-3 comSchedulerSelectCard"
data-function="' . $this->escape($function) : ''; ?>"
aria-label="<?php echo Text::sprintf('COM_SCHEDULER_SELECT_TASK_TYPE', $name); ?>">
<div class="new-task-details">
<h3 class="new-task-title"><?php echo $name; ?></h3>
Expand Down