Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
b3563fd3
Commit
b3563fd3
authored
5 years ago
by
kevalbhatt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3599 : Beta UI: While Saving search , limit and offset are not set…
ATLAS-3599 : Beta UI: While Saving search , limit and offset are not set properly when using Beta UI.
parent
e04c4f5c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
CustomFilterTreeLayoutView.js
...public/js/views/search/tree/CustomFilterTreeLayoutView.js
+12
-2
No files found.
dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
View file @
b3563fd3
...
@@ -354,7 +354,10 @@ define([
...
@@ -354,7 +354,10 @@ define([
entityDefCollection
:
that
.
entityDefCollection
entityDefCollection
:
that
.
entityDefCollection
});
});
searchType
===
'ADVANCED'
?
that
.
isBasic
=
false
:
that
.
isBasic
=
true
;
searchType
===
'ADVANCED'
?
that
.
isBasic
=
false
:
that
.
isBasic
=
true
;
_
.
extend
({},
this
.
options
.
value
,
params
),
_
.
extend
({},
this
.
options
.
value
,
params
);
// Utils.notifyInfo({
// content: "Saved values are selected."
// })
Utils
.
setUrl
({
Utils
.
setUrl
({
url
:
'#!/search/searchResult'
,
url
:
'#!/search/searchResult'
,
...
@@ -447,11 +450,18 @@ define([
...
@@ -447,11 +450,18 @@ define([
var
value
=
this
.
getValue
();
var
value
=
this
.
getValue
();
if
(
value
&&
(
value
.
type
||
value
.
tag
||
value
.
query
||
value
.
term
))
{
if
(
value
&&
(
value
.
type
||
value
.
tag
||
value
.
query
||
value
.
term
))
{
value
.
searchType
==
"basic"
?
this
.
isBasic
=
true
:
this
.
isBasic
=
false
;
value
.
searchType
==
"basic"
?
this
.
isBasic
=
true
:
this
.
isBasic
=
false
;
var
urlObj
=
Utils
.
getUrlState
.
getQueryParams
();
if
(
urlObj
)
{
// includeDE value in because we need to send "true","false" to the server.
urlObj
.
includeDE
=
urlObj
.
includeDE
==
"true"
?
true
:
false
;
urlObj
.
excludeSC
=
urlObj
.
excludeSC
==
"true"
?
true
:
false
;
urlObj
.
excludeST
=
urlObj
.
excludeST
==
"true"
?
true
:
false
;
}
this
.
customFilterSwitchBtnUpdate
();
this
.
customFilterSwitchBtnUpdate
();
this
.
callSaveModalLayoutView
({
this
.
callSaveModalLayoutView
({
'collection'
:
this
.
isBasic
?
this
.
saveSearchBaiscCollection
.
fullCollection
:
this
.
saveSearchAdvanceCollection
.
fullCollection
,
'collection'
:
this
.
isBasic
?
this
.
saveSearchBaiscCollection
.
fullCollection
:
this
.
saveSearchAdvanceCollection
.
fullCollection
,
getValue
:
function
()
{
getValue
:
function
()
{
return
value
return
_
.
extend
({},
value
,
urlObj
);
},
},
'isBasic'
:
this
.
isBasic
'isBasic'
:
this
.
isBasic
});
});
...
...
This diff is collapsed.
Click to expand it.
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