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
1a60c92d
Commit
1a60c92d
authored
Feb 26, 2016
by
Шакарим Сапа
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Debugging
parent
1508a23d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
13 deletions
+8
-13
common/modules/triggers/controllers/DefaultController.php
common/modules/triggers/controllers/DefaultController.php
+7
-11
common/modules/triggers/models/TriggerTrigger.php
common/modules/triggers/models/TriggerTrigger.php
+1
-1
common/modules/users/models/User.php
common/modules/users/models/User.php
+0
-1
No files found.
common/modules/triggers/controllers/DefaultController.php
View file @
1a60c92d
...
@@ -49,7 +49,6 @@ class DefaultController extends BaseController
...
@@ -49,7 +49,6 @@ class DefaultController extends BaseController
$actualTriggers
=
TriggerTrigger
::
getActualTriggers
();
$actualTriggers
=
TriggerTrigger
::
getActualTriggers
();
// Перебираем эти сообщения в цикле
// Перебираем эти сообщения в цикле
foreach
(
$uncheckedArray
as
$message
)
{
foreach
(
$uncheckedArray
as
$message
)
{
$triggerIsUsed
=
false
;
// Проверяем каждое сообщение на срабатывание триггера
// Проверяем каждое сообщение на срабатывание триггера
foreach
(
$actualTriggers
as
$trigger
)
{
foreach
(
$actualTriggers
as
$trigger
)
{
// Вызвали срабатывание условий
// Вызвали срабатывание условий
...
@@ -57,19 +56,16 @@ class DefaultController extends BaseController
...
@@ -57,19 +56,16 @@ class DefaultController extends BaseController
// Если триггер сработал инициируем действие
// Если триггер сработал инициируем действие
if
(
$triggerResult
===
true
)
{
if
(
$triggerResult
===
true
)
{
$init
=
$trigger
->
initAction
([
'email'
=>
$message
->
email
]);
$init
=
$trigger
->
initAction
([
'email'
=>
$message
->
email
]);
if
(
$init
===
true
)
{
if
(
$init
!==
true
)
$triggerIsUsed
=
true
;
}
else
{
echo
$init
;
echo
$init
;
}
}
}
}
}
if
(
$triggerIsUsed
===
true
)
{
//
if ($triggerIsUsed===true) {
/** @var TriggerSchedule $model */
//
/** @var TriggerSchedule $model */
$model
=
TriggerSchedule
::
findOne
(
$message
->
getPrimaryKey
());
//
$model=TriggerSchedule::findOne($message->getPrimaryKey());
$model
->
checked
=
1
;
//
$model->checked=1;
$model
->
save
();
//
$model->save();
}
//
}
}
}
}
}
}
}
common/modules/triggers/models/TriggerTrigger.php
View file @
1a60c92d
...
@@ -264,7 +264,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
...
@@ -264,7 +264,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
$schedule
=
new
TriggerSchedule
();
$schedule
=
new
TriggerSchedule
();
$schedule
->
sended
=
1
;
$schedule
->
sended
=
1
;
$schedule
->
checked
=
(
array_key_exists
(
'checked'
,
$params
))
?
$params
[
'checked'
]
:
0
;
//
$schedule->checked=(array_key_exists('checked', $params)) ? $params['checked'] : 0;
// $schedule->message_id=$newMessageId;
// $schedule->message_id=$newMessageId;
$schedule
->
message
=
$template
->
getTemplate
();
$schedule
->
message
=
$template
->
getTemplate
();
$schedule
->
email
=
$email
;
$schedule
->
email
=
$email
;
...
...
common/modules/users/models/User.php
View file @
1a60c92d
...
@@ -578,7 +578,6 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
...
@@ -578,7 +578,6 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
foreach
(
$actualTriggers
as
$trigger
)
{
foreach
(
$actualTriggers
as
$trigger
)
{
$exists
=
TriggerCondition
::
find
()
->
where
([
'trigger_id'
=>
$trigger
->
id
,
'condition_id'
=>
CheckUserToRegistration
::
CONDITION_ID
])
->
exists
();
$exists
=
TriggerCondition
::
find
()
->
where
([
'trigger_id'
=>
$trigger
->
id
,
'condition_id'
=>
CheckUserToRegistration
::
CONDITION_ID
])
->
exists
();
if
(
$exists
===
true
)
{
if
(
$exists
===
true
)
{
$params
[
'checked'
]
=
1
;
$init
=
$trigger
->
initAction
(
$params
);
$init
=
$trigger
->
initAction
(
$params
);
if
(
$init
===
true
)
{
if
(
$init
===
true
)
{
return
true
;
return
true
;
...
...
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