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
eced9a69
Commit
eced9a69
authored
6 years ago
by
gutkaBinit
Committed by
nixonrodrigues
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3248 UI: Number of Search Page results not matching set Page limit.
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
2f461b42
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
TableLayout.js
dashboardv2/public/js/utils/TableLayout.js
+1
-0
SearchResultLayoutView.js
dashboardv2/public/js/views/search/SearchResultLayoutView.js
+4
-3
No files found.
dashboardv2/public/js/utils/TableLayout.js
View file @
eced9a69
...
...
@@ -273,6 +273,7 @@ define(['require',
},
this
);
this
.
listenTo
(
this
,
"grid:refresh"
,
function
()
{
if
(
this
.
grid
)
{
this
.
grid
.
collection
.
fullCollection
.
reset
(
this
.
collection
.
entities
,
{
silent
:
true
});
this
.
grid
.
trigger
(
"backgrid:refresh"
);
}
});
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/SearchResultLayoutView.js
View file @
eced9a69
...
...
@@ -267,7 +267,7 @@ define(['require',
el
:
this
.
ui
.
colManager
},
gridOpts
:
{
emptyText
:
'No Record found!'
,
emptyText
:
'No Record
s
found!'
,
className
:
'table table-hover backgrid table-quickMenu colSort'
},
filterOpts
:
{},
...
...
@@ -425,12 +425,13 @@ define(['require',
return
;
}
if
(
isPostMethod
)
{
that
.
searchCollection
.
referredEntities
=
dataOrCollection
.
referredEntities
;
Utils
.
findAndMergeRefEntity
({
attributeObject
:
dataOrCollection
.
entities
,
referredEntities
:
dataOrCollection
.
referredEntities
});
that
.
searchCollection
.
fullCollection
.
reset
(
dataOrCollection
.
entities
,
{
silent
:
false
});
that
.
searchCollection
.
referredEntities
=
dataOrCollection
.
referredEntities
;
that
.
searchCollection
.
entities
=
dataOrCollection
.
entities
;
that
.
searchCollection
.
reset
(
dataOrCollection
.
entities
,
{
silent
:
true
});
}
...
...
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