Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
a58ca0f4
Commit
a58ca0f4
authored
May 05, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Проверяем триггеры
parent
6f27b141
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
13 deletions
+19
-13
common/modules/triggers/components/conditions/Conditions.php
common/modules/triggers/components/conditions/Conditions.php
+7
-1
common/modules/triggers/controllers/DefaultController.php
common/modules/triggers/controllers/DefaultController.php
+12
-12
No files found.
common/modules/triggers/components/conditions/Conditions.php
View file @
a58ca0f4
...
...
@@ -181,6 +181,11 @@ class Conditions {
return
false
;
}
/**
* @param $user_id
* @param $trigger_id
* @return bool
*/
public
function
handleUserByTriggerId
(
$user_id
,
$trigger_id
)
{
/** @var User $user */
...
...
@@ -213,7 +218,8 @@ class Conditions {
/**
* Проверяем массив параметров на срабатывание хотябы одного условия
* @param $array
* @param $message
* @param null $message
* @param array $params
* @return bool
*/
public
static
function
checkConditionsArray
(
$array
,
$message
=
null
,
$params
=
array
()){
...
...
common/modules/triggers/controllers/DefaultController.php
View file @
a58ca0f4
...
...
@@ -98,18 +98,18 @@ class DefaultController extends BaseController
// Производим проверку событий
$users
=
User
::
find
()
->
all
();
//
foreach($users as $user) {
//
foreach($actualTriggers as $trigger) {
//
// Вызвали метод проверки срабатывания условий
//
$triggerResult = Conditions::init()->handleUserByTriggerId($user->getPrimaryKey(), $trigger->getPrimaryKey());
//
// Если триггер сработал инициируем действие
//
if ($triggerResult===true) {
//
$init = $trigger->initAction(['email' => $user->email]);
//
if ($init!==true)
//
echo $init;
//
}
//
}
//
}
foreach
(
$users
as
$user
)
{
foreach
(
$actualTriggers
as
$trigger
)
{
// Вызвали метод проверки срабатывания условий
$triggerResult
=
Conditions
::
init
()
->
handleUserByTriggerId
(
$user
->
getPrimaryKey
(),
$trigger
->
getPrimaryKey
());
// Если триггер сработал инициируем действие
if
(
$triggerResult
===
true
)
{
$init
=
$trigger
->
initAction
([
'email'
=>
$user
->
email
]);
if
(
$init
!==
true
)
echo
$init
;
}
}
}
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment