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
3672c55a
Commit
3672c55a
authored
Feb 05, 2016
by
Shakarim Sapa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- FIX
parent
5be404d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
common/modules/triggers/components/conditions/Conditions.php
common/modules/triggers/components/conditions/Conditions.php
+2
-3
No files found.
common/modules/triggers/components/conditions/Conditions.php
View file @
3672c55a
...
...
@@ -110,7 +110,6 @@ class Conditions {
*/
public
static
function
getControlButtons
(
$condition_array
=
array
(),
$key
=
null
){
$key
=
(
$key
!==
null
)
?
$key
:
rand
(
100000
,
999999
);
return
'asd'
;
return
'<tr data-key='
.
$key
.
'><td>'
.
Conditions
::
init
()
->
getControlArea
(
$condition_array
,
$key
)
.
'</td></tr>'
;
}
...
...
@@ -130,8 +129,8 @@ class Conditions {
$html
.=
'<div class="btn-group" role="group">'
;
$html
.=
'<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="glyphicon glyphicon-plus"></i></button>'
;
$html
.=
'<ul class="dropdown-menu">'
;
foreach
(
Conditions
::
init
()
->
getConditions
()
as
$id
=>
$condition
)
$html
.=
'<li><a href="#" data-id="'
.
$id
.
'" class="add_condition">'
.
$condition
->
getName
()
.
'</a></li>'
;
//
foreach(Conditions::init()->getConditions() as $id=>$condition)
//
$html .= '<li><a href="#" data-id="'.$id.'" class="add_condition">'.$condition->getName().'</a></li>';
$html
.=
'</ul>'
;
$html
.=
'</div>'
;
return
$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