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
081327cf
Commit
081327cf
authored
Feb 02, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Добавлена передача дополнительного параметра key. Необходим для правильной группировки условий.
parent
2222d9a2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
backend/web/js/triggers/conditions/admin-block.js
backend/web/js/triggers/conditions/admin-block.js
+5
-1
common/modules/triggers/controllers/TriggerAdminController.php
...n/modules/triggers/controllers/TriggerAdminController.php
+1
-1
No files found.
backend/web/js/triggers/conditions/admin-block.js
View file @
081327cf
// Метод добавляющий новое условие
$
(
document
).
on
(
'
click
'
,
'
a.add_condition
'
,
function
()
{
var
id
=
$
(
this
).
data
(
'
id
'
);
var
container
=
$
(
this
).
closest
(
'
div.btn-group
'
).
parent
().
children
(
'
div.conditions-block
'
);
var
key
=
$
(
this
).
closest
(
'
tr
'
).
data
(
'
key
'
);
$
.
ajax
({
url
:
'
/triggers/trigger-admin/getconditionhtml
'
,
data
:
{
id
:
id
id
:
id
,
key
:
key
},
method
:
'
GET
'
,
success
:
function
(
response
)
{
...
...
@@ -15,6 +18,7 @@ $(document).on('click', 'a.add_condition', function() {
})
});
// Метод добавляющий новую строку "И"
$
(
document
).
on
(
'
click
'
,
'
button.add-and-condition
'
,
function
()
{
var
container
=
$
(
this
).
closest
(
'
table
'
).
children
(
'
tbody
'
);
...
...
common/modules/triggers/controllers/TriggerAdminController.php
View file @
081327cf
...
...
@@ -39,7 +39,7 @@ class TriggerAdminController extends AdminController {
return
(
Yii
::
$app
->
request
->
isAjax
)
?
Json
::
encode
(
$result
)
:
$result
;
}
public
function
actionGetconditionhtml
(
$id
){
public
function
actionGetconditionhtml
(
$id
,
$key
){
$condition
=
Conditions
::
init
()
->
getConditionById
(
$id
);
$result
=
$this
->
renderPartial
(
'condition-html'
,
...
...
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