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
2222d9a2
Commit
2222d9a2
authored
Feb 02, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Кнопки управления условиями теперь генерируются по условию и кодируются в json если это ajax
parent
3002b9b3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
common/modules/triggers/controllers/TriggerAdminController.php
...n/modules/triggers/controllers/TriggerAdminController.php
+4
-1
No files found.
common/modules/triggers/controllers/TriggerAdminController.php
View file @
2222d9a2
...
...
@@ -35,7 +35,8 @@ class TriggerAdminController extends AdminController {
}
public
function
actionGetandconditionhtml
(){
return
Json
::
encode
(
'<tr><td>'
.
Conditions
::
init
()
->
getControlArea
()
.
'</td></tr>'
);
$result
=
'<tr data-key='
.
rand
(
100000
,
999999
)
.
'><td>'
.
Conditions
::
init
()
->
getControlArea
()
.
'</td></tr>'
;
return
(
Yii
::
$app
->
request
->
isAjax
)
?
Json
::
encode
(
$result
)
:
$result
;
}
public
function
actionGetconditionhtml
(
$id
){
...
...
@@ -79,6 +80,8 @@ class TriggerAdminController extends AdminController {
$model
=
new
TriggerTrigger
();
if
(
$model
->
load
(
Yii
::
$app
->
request
->
post
()))
{
var_dump
(
Yii
::
$app
->
request
->
post
(
'Conditions'
));
die
;
$datetime
=
new
\DateTime
();
$model
->
owner_id
=
Yii
::
$app
->
user
->
getId
();
$model
->
date_create
=
$datetime
->
format
(
'Y-m-d H:i:s'
);
...
...
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