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

[4.4] Fix Permissions for Manually Running Scheduled Tasks #36719

Draft
wants to merge 4 commits into
base: 4.4-dev
Choose a base branch
from
Draft

[4.4] Fix Permissions for Manually Running Scheduled Tasks #36719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2319119
Disable "run task" button on lack of authorization
ditsuke Jan 17, 2022
ea7dc6a
Merge branch '4.1-dev' of github.com:joomla/joomla-cms 'fix-disabled-…
ditsuke Jan 17, 2022
b306858
Allow creators of tasks the ability to run them
ditsuke Jan 17, 2022
bb3f253
Get `created_by` in default TasksModel query
ditsuke Jan 17, 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
Next Next commit
Disable "run task" button on lack of authorization 
- Explicitly disables the "run task" button on
  insufficient authorization.
- Adds tooltip to give context on disabling.
  • Loading branch information
@ditsuke
ditsuke committed Jan 17, 2022
commit 23191198f7e52eac7ffd1450122201f10942e38a
20 changes: 16 additions & 4 deletions administrator/components/com_scheduler/tmpl/tasks/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,22 @@ class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="

<!-- Test task -->
<td class="small d-none d-md-table-cell">
<button type="button" class="btn btn-sm btn-warning" <?php echo $item->state < 0 ? 'disabled' : ''; ?> data-id="<?php echo (int) $item->id; ?>" data-title="<?php echo htmlspecialchars($item->title); ?>" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#scheduler-test-modal">
<span class="fa fa-play fa-sm me-2"></span>
<?php echo Text::_('COM_SCHEDULER_TEST_RUN'); ?>
</button>
<div id="run-task-btn-wrapper"
<?php
$disabled = ($item->state < 0 || !$user->authorise('core.testrun', 'com_scheduler.task.' . $item->id));
if ($disabled):
$reason = Text::_($item->state < 0 ? "COM_SCHEDULER_MANAGER_TOOLTIP_TASK_TRASHED" : "COM_SCHEDULER_MANAGER_TOOLTIP_NOT_AUTHORIZED");
echo ' data-toggle="tooltip" data-placement="top" title="' . $reason . '"';
endif;
?>
>
<button type="button" class="btn btn-sm btn-warning"
<?php if ($disabled): echo ' disabled '; endif;?>
data-id="<?php echo (int) $item->id; ?>" data-title="<?php echo htmlspecialchars($item->title); ?>" data-bs-toggle="modal" data-bs-backdrop="static" data-bs-target="#scheduler-test-modal">
<span class="fa fa-play fa-sm me-2"></span>
<?php echo Text::_('COM_SCHEDULER_TEST_RUN'); ?>
</button>
</div>
</td>

<!-- Item ID -->
Expand Down
2 changes: 2 additions & 0 deletions administrator/language/en-GB/com_scheduler.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ COM_SCHEDULER_LAST_RUN_DATE="Last Run Date"
COM_SCHEDULER_MANAGER_TASKS="Scheduled Tasks"
COM_SCHEDULER_MANAGER_TASK_EDIT="Edit Task"
COM_SCHEDULER_MANAGER_TASK_NEW="New Task"
COM_SCHEDULER_MANAGER_TOOLTIP_NOT_AUTHORIZED="Not authorized"
COM_SCHEDULER_MANAGER_TOOLTIP_TASK_TRASHED="Task has been trashed"
COM_SCHEDULER_MSG_MANAGE_NO_TASK_PLUGINS="There are no task types matching your query."
COM_SCHEDULER_NEW_TASK="New Task"
COM_SCHEDULER_N_ITEMS_DELETED="%d tasks deleted."
Expand Down