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
60dd5b90
Commit
60dd5b90
authored
Apr 27, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Корректировка обработки передаваемых параметров
parent
86094c7c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
common/modules/triggers/models/TriggerTrigger.php
common/modules/triggers/models/TriggerTrigger.php
+7
-3
No files found.
common/modules/triggers/models/TriggerTrigger.php
View file @
60dd5b90
...
@@ -241,12 +241,16 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
...
@@ -241,12 +241,16 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
$templateData
[
'user_fio'
]
=
(
isset
(
$user_fio
))
?
$user_fio
:
''
;
$templateData
[
'user_fio'
]
=
(
isset
(
$user_fio
))
?
$user_fio
:
''
;
// Наличие отправки в расписании
$sendExist
=
TriggerSchedule
::
find
()
->
where
([
'trigger_id'
=>
$this
->
id
,
'email'
=>
$email
])
->
exists
();
$sendExist
=
TriggerSchedule
::
find
()
->
where
([
'trigger_id'
=>
$this
->
id
,
'email'
=>
$email
])
->
exists
();
// Индикатор отправки
$send
=
true
;
if
(
array_key_exists
(
'unique'
,
$params
)
&&
$params
[
'unique'
]
==
false
)
// Если указан параметр unique и этот параметр равен true
$sendExist
=
false
;
if
(
array_key_exists
(
'unique'
,
$params
)
&&
$params
[
'unique'
]
==
false
&&
$sendExist
===
true
)
$send
=
false
;
if
(
!
$sendExist
)
{
if
(
$send
)
{
return
TriggerSchedule
::
sendMessage
(
$email
,
$this
->
message_template_id
,
$templateData
,
$this
->
id
);
return
TriggerSchedule
::
sendMessage
(
$email
,
$this
->
message_template_id
,
$templateData
,
$this
->
id
);
}
}
}
}
...
...
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