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.

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

[5.3] [4.1 ScheduledTasks]Edits for run task #36725

Open
wants to merge 29 commits into
base: 5.3-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
617bf20
edits for run task
niharikamahajan02 Jan 18, 2022
8388459
Merge branch '4.1-dev' into c1
niharikamahajan02 Jan 22, 2022
0312369
some edits and runTestCron replacement
niharikamahajan02 Jan 22, 2022
3e66014
onAjaxRunSchedulerTest to onAjaxRunSchedulerTask
niharikamahajan02 Jan 22, 2022
1326672
more edits
niharikamahajan02 Jan 22, 2022
42f7f89
more edits
niharikamahajan02 Jan 22, 2022
b37ca6b
Merge branch '4.1-dev' into c1
niharikamahajan02 Jan 23, 2022
46fdba4
edits for test-task
niharikamahajan02 Jan 23, 2022
714cc7e
Merge branch 'c1' of https://github.com/niharikamahajan02/joomla-cms …
niharikamahajan02 Jan 23, 2022
7ee422d
edits
niharikamahajan02 Jan 23, 2022
cff8ee8
test-task to run-task
niharikamahajan02 Feb 13, 2022
fd2f3a3
files
niharikamahajan02 Feb 13, 2022
6d1ce13
Merge branch '4.1-dev' of github.com:joomla/joomla-cms into 'c1'
ditsuke Feb 13, 2022
eab956b
Merge pull request #1 from ditsuke/#36725-task-test-to-task-run
niharikamahajan02 Feb 13, 2022
8b8b600
Merge branch '4.2-dev' into c1
richard67 Jun 27, 2022
aeef967
Merge branch '4.2-dev' into c1
richard67 Jun 27, 2022
17cee04
Phase 1 convert BRANCH to PSR-12
joomla-bot Jun 27, 2022
4012f2d
Phase 2 convert BRANCH to PSR-12
joomla-bot Jun 27, 2022
312dcad
Merge tag 'psr12final' into psr12/merge/36725
joomla-bot Jun 27, 2022
b4d1ff8
Merge branch '4.4-dev' into c1
HLeithner Apr 7, 2023
05dffa0
Add back removed language strings and deprecate them
HLeithner Apr 7, 2023
2cc618e
Merge branch '5.0-dev' into c1
laoneo Apr 12, 2023
43d7b3a
Update access.xml
niharikamahajan02 Dec 22, 2023
e69218e
Update schedulerunner.php
niharikamahajan02 Dec 22, 2023
ecc1a1e
Update admin-view-run-task.es6.js
niharikamahajan02 Dec 22, 2023
c07f23b
Update joomla.asset.json
niharikamahajan02 Dec 22, 2023
eaf84c3
Update com_scheduler.ini
niharikamahajan02 Dec 22, 2023
7438382
Update default.php
niharikamahajan02 Dec 22, 2023
6880884
Update schedulerunner.php
niharikamahajan02 Dec 22, 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
Prev Previous commit
Next Next commit
some edits and runTestCron replacement
  • Loading branch information
niharikamahajan02 committed Jan 22, 2022
commit 0312369974241a33a214696247190ed323df2be4
2 changes: 1 addition & 1 deletion administrator/language/en-GB/com_scheduler.ini
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ COM_SCHEDULER_OPTION_EXECUTION_MANUAL_LABEL="Manual Execution"
COM_SCHEDULER_OPTION_ORPHANED_HIDE="Hide Orphaned"
COM_SCHEDULER_OPTION_ORPHANED_ONLY="Only Orphaned"
COM_SCHEDULER_OPTION_ORPHANED_SHOW="Show Orphaned"
COM_SCHEDULER_PERMISSION_TESTRUN="Test task"
COM_SCHEDULER_PERMISSION_RUN_TASK="Run task"
COM_SCHEDULER_ROUTINE_LOG_PREFIX="Task> "
COM_SCHEDULER_RUNNING_SINCE="Running since %s"
COM_SCHEDULER_RUN_TASK="Run Task"
Expand Down
4 changes: 2 additions & 2 deletions plugins/system/schedulerunner/schedulerunner.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static function getSubscribedEvents(): array
$mapping['onContentPrepareForm'] = 'enhanceSchedulerConfig';
$mapping['onExtensionBeforeSave'] = 'generateWebcronKey';

$mapping['onAjaxRunSchedulerTest'] = 'runTestCron';
$mapping['onAjaxRunSchedulerTest'] = 'runTaskCron';
}
}

Expand Down Expand Up @@ -252,7 +252,7 @@ public function runWebCron(Event $event)
*
* @throws Exception
*/
public function runTestCron(Event $event)
public function runTaskCron(Event $event)
{
if (!Session::checkToken('GET'))
{
Expand Down