Check if XForm is a MergedXForm and merge field choices if it is(a MergedXForm) #2011
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
FrankApiyo
changed the title
FrankApiyo
force-pushed
the
merge-merged-xform-field-choices
branch
3 times, most recently
from
70e9cad
to
1f46f1e
Compare
FrankApiyo
changed the title
FrankApiyo
force-pushed
the
merge-merged-xform-field-choices
branch
from
1f46f1e
to
64a7d1a
Compare
ivermac
suggested changes
Feb 9, 2021
Comment on lines
+443
to
+446
| if name: | ||
| return get_field_from_field_name(name, xform) | ||
| elif xpath: | ||
| return get_field_from_field_xpath(xpath, xform) |
There was a problem hiding this comment.
Suggested change
| if name: | |
| return get_field_from_field_name(name, xform) | |
| elif xpath: | |
| return get_field_from_field_xpath(xpath, xform) | |
| return get_field_from_field_xpath(name or xpath, xform) |
There was a problem hiding this comment.
I'm not sure if this would work, because we need to call a different method when we have name from when we have xpath
There was a problem hiding this comment.
Aah...cool, my bad. I thought it was the same function.
onadata/libs/utils/chart_tools.py
Outdated
Comment on lines
475
to
479
| try: | ||
| merged_xform = MergedXForm.objects.get(pk=xform.pk) | ||
| except MergedXForm.DoesNotExist: | ||
| # this is not a MergedXForm | ||
| pass |
There was a problem hiding this comment.
XForm has is_merged_dataset property. We could re-write the above as
if xform.is_merged_dataset:
merged_xform = MergedXForm.objects.get(pk=xform.pk)| @@ -47,6 +74,59 @@ def setUp(self): | |||
| os.path.dirname(__file__), '..', 'fixtures', 'forms', | |||
| 'tutorial', 'instances', '3.xml')) | |||
|
|
|||
| def test_correct_data_for_charts(self): | |||
There was a problem hiding this comment.
Should we change the test name to something like test_correct_merged_dataset_data_for_charts?
FrankApiyo
force-pushed
the
merge-merged-xform-field-choices
branch
from
64a7d1a
to
5a7c892
Compare
ivermac
previously approved these changes
Feb 9, 2021
There was a problem hiding this comment.
looks good to me. I'd like @DavisRayM to check this out as well
FrankApiyo
force-pushed
the
merge-merged-xform-field-choices
branch
from
5a7c892
to
e028bdf
Compare
DavisRayM
approved these changes
Feb 9, 2021
This was referenced Feb 11, 2021
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.
Steps taken to verify this change does what is intended
Closes #2013