Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
7f38cf7f
Commit
7f38cf7f
authored
5 years ago
by
Seamus Lee
Browse files
Options
Downloads
Patches
Plain Diff
Update Language to be more user friendly when checking logs
parent
f6abe3a1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CRM/Core/BAO/ActionSchedule.php
+1
-1
1 addition, 1 deletion
CRM/Core/BAO/ActionSchedule.php
tests/phpunit/api/v3/JobTest.php
+1
-1
1 addition, 1 deletion
tests/phpunit/api/v3/JobTest.php
with
2 additions
and
2 deletions
CRM/Core/BAO/ActionSchedule.php
+
1
−
1
View file @
7f38cf7f
...
...
@@ -549,7 +549,7 @@ FROM civicrm_action_schedule cas
// dev/core#369 If an SMS provider is deleted then the relevant row in the action_schedule_table is set to NULL
// So we need to exclude them.
if
(
CRM_Utils_System
::
isNull
(
$schedule
->
sms_provider_id
))
{
return
[
"sms_provider_missing"
=>
"SMS
Provider is NULL in database cannot send reminder
"
];
return
[
"sms_provider_missing"
=>
"SMS
reminder cannot be sent because the SMS provider has been deleted.
"
];
}
$messageSubject
=
$tokenRow
->
render
(
'subject'
);
...
...
This diff is collapsed.
Click to expand it.
tests/phpunit/api/v3/JobTest.php
+
1
−
1
View file @
7f38cf7f
...
...
@@ -412,7 +412,7 @@ class api_v3_JobTest extends CiviUnitTestCase {
$this
->
assertEquals
(
$sentToID
,
$theChosenOneID
);
$cronlog
=
CRM_Core_DAO
::
executeQuery
(
"SELECT * FROM civicrm_action_log"
)
->
fetchAll
()[
0
];
$this
->
assertEquals
(
1
,
$cronlog
[
'is_error'
]);
$this
->
assertEquals
(
'SMS
Provider is NULL in database cannot send reminder
'
,
$cronlog
[
'message'
]);
$this
->
assertEquals
(
'SMS
reminder cannot be sent because the SMS provider has been deleted.
'
,
$cronlog
[
'message'
]);
$this
->
setupForSmsTests
(
TRUE
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment