1188 remove x total #1290
Merged
1188 remove x total #1290
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wambere
force-pushed
the
1188-remove-x-total
branch
from
97e6fb0
to
6f68cd1
Compare
pld
requested changes
Mar 16, 2018
| @@ -132,42 +132,34 @@ def data(self, request, **kwargs): | |||
| qs_kwargs.update({'id__gt': gt_id}) | |||
|
|
|||
| instances = Instance.objects.filter(**qs_kwargs).order_by('pk') | |||
| length = self.total_count = instances.count() | |||
| self.total_count = instances.count() | |||
There was a problem hiding this comment.
this should be in-lined into the count conditinoal on line 138 so we don't calculate it by default
pld
reviewed
Mar 16, 2018
|
|
||
| if count: | ||
| self.total_count = instances.count() |
There was a problem hiding this comment.
do we even need to set a class variable here? Why not put instances.count() inline as the value below?
pld
reviewed
Mar 16, 2018
onadata/libs/utils/common_tools.py
Outdated
| """ | ||
| Generator function to stream JSON data | ||
| """ | ||
|
|
There was a problem hiding this comment.
remove blank line, other functions do not have a line between docstring and code
pld
approved these changes
Mar 16, 2018
Wambere
force-pushed
the
1188-remove-x-total
branch
2 times, most recently
from
4dac099
to
54df22b
Compare
- Replace count query with xform.submission_count
…removing the need for queryset.count()
…a_viewset to use iter.next instead of length to place commas
Wambere
force-pushed
the
1188-remove-x-total
branch
from
6bef64f
to
a943f75
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #1188