Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dataprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Don Wijesooriya
dataprocessor
Commits
cf5b4a3a
Commit
cf5b4a3a
authored
5 years ago
by
jaapjansma
Browse files
Options
Downloads
Patches
Plain Diff
changed operator on search screen to be hidden and editable after a click
parent
0873fff8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
templates/CRM/Dataprocessor/Form/Filter/GenericFilter.tpl
+7
-1
7 additions, 1 deletion
templates/CRM/Dataprocessor/Form/Filter/GenericFilter.tpl
templates/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl
+15
-1
15 additions, 1 deletion
...s/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl
with
22 additions
and
2 deletions
templates/CRM/Dataprocessor/Form/Filter/GenericFilter.tpl
+
7
−
1
View file @
cf5b4a3a
{
crmScope
extensionKey
=
'dataprocessor'
}
{
assign
var
=
fieldOp
value
=
$filter.alias
|
cat
:
"_op"
}
{
assign
var
=
filterVal
value
=
$filter.alias
|
cat
:
"_value"
}
{
assign
var
=
filterMin
value
=
$filter.alias
|
cat
:
"_min"
}
...
...
@@ -11,10 +12,15 @@
{
elseif
$form
.
$fieldOp.html
}
<tr>
<td
class=
"label"
>
{
$filter.title
}
</td>
<td>
{
$form
.
$fieldOp.html
}
</td>
<td>
<span
class=
"filter-processor-element
{
$filter.alias
}
"
>
{
$form
.
$fieldOp.html
}
</span>
<span
class=
"filter-processor-show-close
{
$filter.alias
}
"
>
</span>
</td>
<td>
<span
id=
"
{
$filterVal
}
_cell"
>
{
$form
.
$filterVal.label
}
{
$form
.
$filterVal.html
}
</span>
<span
id=
"
{
$filterMin
}
_max_cell"
>
{
$form
.
$filterMin.label
}
{
$form
.
$filterMin.html
}
{
$form
.
$filterMax.label
}
{
$form
.
$filterMax.html
}
</span>
</td>
</tr>
{/
if
}
{/
crmScope
}
This diff is collapsed.
Click to expand it.
templates/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl
+
15
−
1
View file @
cf5b4a3a
...
...
@@ -14,7 +14,7 @@
<th>
{
ts
}
Value
{/
ts
}
</th>
</tr>
{
foreach
from
=
$filters
key
=
filterName
item
=
filter
}
{
include
file
=
$filter.template
filterName
=
filter
.
alias
filter
=
$filter.filter
}
{
include
file
=
$filter.template
filterName
=
$
filter.alias
filter
=
$filter.filter
}
{/
foreach
}
</table>
<div
class=
"crm-submit-buttons"
>
{
include
file
=
"CRM/common/formButtons.tpl"
location
=
"botton"
}
</div>
...
...
@@ -33,6 +33,7 @@
{
literal
}
var
val
=
document
.
getElementById
(
"
{/
literal
}{
$fieldOp
}{
literal
}
"
).
value
;
{/
literal
}
{/
if
}
{
literal
}
showHideMaxMinVal
(
"
{/
literal
}{
$filterName
}{
literal
}
"
,
val
);
{/
literal
}
{
literal
}
initializeOperator
(
"
{/
literal
}{
$filterName
}{
literal
}
"
);
{/
literal
}
{/
foreach
}
{
literal
}
...
...
@@ -52,6 +53,19 @@
}
}
function
initializeOperator
(
filterName
)
{
var
currentOp
=
cj
(
'
.filter-processor-element.
'
+
filterName
+
'
select option:selected
'
);
cj
(
'
.filter-processor-element.
'
+
filterName
).
addClass
(
'
hiddenElement
'
);
cj
(
'
.filter-processor-show-close.
'
+
filterName
).
html
(
currentOp
.
html
()
+
'
<i class="crm-i fa-pencil"> </i>
'
);
cj
(
'
.filter-processor-show-close.
'
+
filterName
).
attr
(
'
title
'
,
'
{/
literal
}{
ts
}
Change
{/
ts
}{
literal
}
'
);
cj
(
'
.filter-processor-show-close.
'
+
filterName
).
addClass
(
'
crm-editable-enabled
'
);
cj
(
'
.filter-processor-show-close.
'
+
filterName
).
click
(
function
()
{
cj
(
'
.filter-processor-element.
'
+
filterName
).
removeClass
(
'
hiddenElement
'
);
cj
(
'
.filter-processor-show-close.
'
+
filterName
).
removeClass
(
'
crm-editable-enabled
'
);
cj
(
'
.filter-processor-show-close.
'
+
filterName
).
addClass
(
'
hiddenElement
'
);
});
}
</script>
{/
literal
}
{/
crmScope
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment