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
b05a3af5
Commit
b05a3af5
authored
May 05, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Проверяем триггеры
parent
db881d28
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
common/modules/triggers/controllers/DefaultController.php
common/modules/triggers/controllers/DefaultController.php
+0
-1
common/modules/triggers/models/TriggerTrigger.php
common/modules/triggers/models/TriggerTrigger.php
+1
-1
No files found.
common/modules/triggers/controllers/DefaultController.php
View file @
b05a3af5
...
@@ -104,7 +104,6 @@ class DefaultController extends BaseController
...
@@ -104,7 +104,6 @@ class DefaultController extends BaseController
$triggerResult
=
Conditions
::
init
()
->
handleUserByTriggerId
(
$user
->
getPrimaryKey
(),
$trigger
->
getPrimaryKey
());
$triggerResult
=
Conditions
::
init
()
->
handleUserByTriggerId
(
$user
->
getPrimaryKey
(),
$trigger
->
getPrimaryKey
());
// Если триггер сработал инициируем действие
// Если триггер сработал инициируем действие
if
(
$triggerResult
===
true
)
{
if
(
$triggerResult
===
true
)
{
echo
'----'
.
$trigger
->
id
.
'<br>'
;
$init
=
$trigger
->
initAction
([
'email'
=>
$user
->
email
]);
$init
=
$trigger
->
initAction
([
'email'
=>
$user
->
email
]);
if
(
$init
!==
true
)
if
(
$init
!==
true
)
echo
$init
;
echo
$init
;
...
...
common/modules/triggers/models/TriggerTrigger.php
View file @
b05a3af5
...
@@ -261,6 +261,6 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
...
@@ -261,6 +261,6 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
$dbg
[
'unique'
]
=
((
$params
[
'unique'
]
===
true
)
?
'Да'
:
'Нет'
);
$dbg
[
'unique'
]
=
((
$params
[
'unique'
]
===
true
)
?
'Да'
:
'Нет'
);
// return TriggerSchedule::sendMessage($email, $this->message_template_id, $templateData, $this->id);
// return TriggerSchedule::sendMessage($email, $this->message_template_id, $templateData, $this->id);
}
}
echo
'Единожды: '
.
$dbg
[
'unique'
]
.
'; ID: '
.
$dbg
[
'trigger_
o
d'
]
.
'; EMAIL:'
.
$dbg
[
'email'
]
.
'; Шаблон: '
.
$dbg
[
'template'
]
.
'<br>'
;
echo
'Единожды: '
.
$dbg
[
'unique'
]
.
'; ID: '
.
$dbg
[
'trigger_
i
d'
]
.
'; EMAIL:'
.
$dbg
[
'email'
]
.
'; Шаблон: '
.
$dbg
[
'template'
]
.
'<br>'
;
}
}
}
}
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