Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
civirules
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
ayduns
civirules
Commits
09f1314f
Commit
09f1314f
authored
9 years ago
by
jaapjansma
Browse files
Options
Downloads
Patches
Plain Diff
renamed event data to trigger data
parent
62974dd7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CRM/Civirules/Action.php
+3
-3
3 additions, 3 deletions
CRM/Civirules/Action.php
CRM/Civirules/Condition.php
+3
-3
3 additions, 3 deletions
CRM/Civirules/Condition.php
with
6 additions
and
6 deletions
CRM/Civirules/Action.php
+
3
−
3
View file @
09f1314f
...
...
@@ -101,10 +101,10 @@ abstract class CRM_Civirules_Action {
* Logs a message to the logger
*
* @param $message
* @param \CRM_Civirules_
EventData_Event
Data|NULL $
event
Data
* @param \CRM_Civirules_
TriggerData_Trigger
Data|NULL $
trigger
Data
* @param string $level Should be one of \Psr\Log\LogLevel
*/
protected
function
logAction
(
$message
,
CRM_Civirules_
EventData_EventData
$event
Data
=
null
,
$level
=
\Psr\Log\LogLevel
::
INFO
)
{
protected
function
logAction
(
$message
,
CRM_Civirules_
TriggerData_TriggerData
$trigger
Data
=
null
,
$level
=
\Psr\Log\LogLevel
::
INFO
)
{
$context
=
array
();
$context
[
'message'
]
=
$message
;
$context
[
'rule_id'
]
=
$this
->
ruleAction
[
'rule_id'
];
...
...
@@ -117,7 +117,7 @@ abstract class CRM_Civirules_Action {
$context
[
'rule_action_id'
]
=
$this
->
ruleAction
[
'id'
];
$context
[
'action_label'
]
=
CRM_Civirules_BAO_Action
::
getActionLabelWithId
(
$this
->
ruleAction
[
'action_id'
]);
$context
[
'action_parameters'
]
=
$this
->
userFriendlyConditionParams
();
$context
[
'contact_id'
]
=
$
event
Data
?
$
event
Data
->
getContactId
()
:
-
1
;
$context
[
'contact_id'
]
=
$
trigger
Data
?
$
trigger
Data
->
getContactId
()
:
-
1
;
$msg
=
"
{
action_label
}
(ID:
{
rule_action_id})\r\n\r\n{message
}
\r\n\r\n
Rule: '
{
rule_title
}
' with id
{
rule_id
}
"
;
if
(
$context
[
'contact_id'
]
>
0
)
{
$msg
.
=
"
\r\n
For contact:
{
contact_id
}
"
;
...
...
This diff is collapsed.
Click to expand it.
CRM/Civirules/Condition.php
+
3
−
3
View file @
09f1314f
...
...
@@ -70,10 +70,10 @@ abstract class CRM_Civirules_Condition {
* Logs a message to the logger
*
* @param $message
* @param \CRM_Civirules_
EventData_Event
Data|NULL $
event
Data
* @param \CRM_Civirules_
TriggerData_Trigger
Data|NULL $
trigger
Data
* @param string $level Should be one of \Psr\Log\LogLevel
*/
protected
function
logCondition
(
$message
,
CRM_Civirules_
EventData_EventData
$event
Data
=
null
,
$level
=
\Psr\Log\LogLevel
::
INFO
)
{
protected
function
logCondition
(
$message
,
CRM_Civirules_
TriggerData_TriggerData
$trigger
Data
=
null
,
$level
=
\Psr\Log\LogLevel
::
INFO
)
{
$context
=
array
();
$context
[
'message'
]
=
$message
;
$context
[
'rule_id'
]
=
$this
->
ruleCondition
[
'rule_id'
];
...
...
@@ -86,7 +86,7 @@ abstract class CRM_Civirules_Condition {
$context
[
'rule_condition_id'
]
=
$this
->
ruleCondition
[
'id'
];
$context
[
'condition_label'
]
=
CRM_Civirules_BAO_Condition
::
getConditionLabelWithId
(
$this
->
ruleCondition
[
'condition_id'
]);
$context
[
'condition_parameters'
]
=
$this
->
userFriendlyConditionParams
();
$context
[
'contact_id'
]
=
$
event
Data
?
$
event
Data
->
getContactId
()
:
-
1
;
$context
[
'contact_id'
]
=
$
trigger
Data
?
$
trigger
Data
->
getContactId
()
:
-
1
;
$msg
=
"
{
condition_label
}
(ID:
{
rule_condition_id})\r\n\r\n{message
}
\r\n\r\n
Rule: '
{
rule_title
}
' with id
{
rule_id
}
"
;
if
(
$context
[
'contact_id'
]
>
0
)
{
$msg
.
=
"
\r\n
For contact:
{
contact_id
}
"
;
...
...
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