-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
base: 5.3-dev
Are you sure you want to change the base?
Conversation
Please review. Thanks |
Please check whether you have taken over all comments from your previous PRs. |
@@ -102,6 +102,14 @@ COM_SCHEDULER_OPTION_ORPHANED_SHOW="Show Orphaned" | |||
COM_SCHEDULER_PERMISSION_TESTRUN="Test task" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
COM_SCHEDULER_PERMISSION_TESTRUN="Test task" | |
COM_SCHEDULER_PERMISSION_RUN_TASK="Run task" |
@niharikamahajan02 please check this constant and the string. You have already renamed it in the access.xml.
Should this also be adapted?
and
Perhaps with runTaskCron |
And maybe also replace onAjaxRunSchedulerTest with onAjaxRunSchedulerTask? @ditsuke what do you think about this improvements? |
@@ -19,12 +19,12 @@ const initRunner = () => { | |||
const paths = Joomla.getOptions('system.paths'); | |||
const token = Joomla.getOptions('com_scheduler.test-task.token'); | |||
const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTest&group=system&id=%d${token ? `&${token}=1` : ''}`; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTest&group=system&id=%d${token ? `&${token}=1` : ''}`; | |
const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTask&group=system&id=%d${token ? `&${token}=1` : ''}`; |
@@ -89,7 +89,7 @@ public static function getSubscribedEvents(): array | |||
$mapping['onContentPrepareForm'] = 'enhanceSchedulerConfig'; | |||
$mapping['onExtensionBeforeSave'] = 'generateWebcronKey'; | |||
|
|||
$mapping['onAjaxRunSchedulerTest'] = 'runTestCron'; | |||
$mapping['onAjaxRunSchedulerTask'] = 'runTaskCron'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
onAjaxRunSchedulerTask must also be fixed in the js files.
please check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ohh yes okk
Please check this two code comments.
|
Also, please check the occurrences of 'test-task'. @niharikamahajan02 sorry for all the comments but it's best to clean it straight away. |
No problem sir 😄 and yes it's better to clean them straight away now |
Yes ,I would rename the file names, function calls and declarations also 👍 |
Please suggest if something needs to be updated now . Thanks |
Thanks for tagging! I really like the changes so far. |
Yes sir , changed the file name now. |
please review it once , I think there are some changes to be done |
@niharikamahajan02 It needs to resolve merge conflicts in files |
but they are already having "run test" in 5.1-dev |
@niharikamahajan02 What do you mean? Drone tests are failing, and if you go to the bottom of this PR on GitHub you clearly see there are the 2 mentioned files which have merge conflicts. If you don't know how to solve them we can help, but maybe you can try it yourself first like I have described. |
applied suggested adjustments
This pull request has been automatically rebased to 5.2-dev. |
I was pointed to this PR after a comment of mine on #43665 (comment)
This branch, based on the current 5.2-dev, should work: https://github.com/brbrbr/joomla-cms/tree/test2run-task |
I have tested this item 🔴 unsuccessfully on 6880884 ERROR MESSAGE: This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/36725. |
@bascherz If you go to this PR on GitHub and scroll to the bottom you will see that this PR has conflicting files, so I cannot really be tested. |
This pull request has been automatically rebased to 5.3-dev. |
Pull Request for Issue #36453 .
Summary of Changes
Edits for run task.