Enforces card order in the MSM and persists that order to the mobile … #4492
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
…app. Also fixes card dirty state issues. re #4487
stickler-ci
reviewed
Jan 30, 2019
arches/app/views/api.py
Outdated
| @@ -152,17 +152,20 @@ def get_child_cardids(card, cardset): | |||
| projects_for_couch = [project.serialize_for_mobile() for project in projects] | |||
| for project in projects_for_couch: | |||
| permitted_cards = set() | |||
| for card in models.CardModel.objects.filter(cardid__in=project['cards']): | |||
| ordered_project_cards = project['cards']; | |||
There was a problem hiding this comment.
E703 statement ends with a semicolon
arches/app/views/api.py
Outdated
| if str(card.nodegroup_id) in permitted_nodegroups: | ||
| permitted_cards.add(str(card.cardid)) | ||
| get_child_cardids(card, permitted_cards) | ||
| project['cards'] = list(permitted_cards) | ||
| for graph in project['graphs']: | ||
| cards = [] | ||
| for card in graph['cards']: | ||
| if card['cardid'] in permitted_cards: | ||
| if card['cardid'] in project['cards']: | ||
| card['relative_position'] = ordered_project_cards.index(card['cardid']) if card['cardid'] in ordered_project_cards else None |
There was a problem hiding this comment.
E501 line too long (148 > 119 characters)
arches/app/views/mobile_survey.py
Outdated
| @@ -56,7 +55,7 @@ def get_survey_resources(mobile_survey): | |||
| for i, graph in enumerate(graphs): | |||
| cards = [] | |||
| if i == 0 or unicode(graph.graphid) in active_graphs: | |||
| cards = [Card.objects.get(pk=card.cardid) for card in models.CardModel.objects.filter(graph=graph)] | |||
| cards = [Card.objects.get(pk=card.cardid) for card in models.CardModel.objects.filter(graph=graph).order_by('sortorder')] | |||
There was a problem hiding this comment.
E501 line too long (133 > 119 characters)
| cards.push(m.cardid); | ||
| }); | ||
| }); | ||
| return cards |
There was a problem hiding this comment.
Missing semicolon. (semi)
| return cards | ||
| }); | ||
|
|
||
| this.mobilesurvey.cards(this.resourceOrderedCards()) |
There was a problem hiding this comment.
Missing semicolon. (semi)
|
|
||
| this.resourceOrderedCards.subscribe(function(val){ | ||
| self.mobilesurvey.cards(val); | ||
| }) |
There was a problem hiding this comment.
Missing semicolon. (semi)
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.
Enforces card order in the MSM and persists that order to the mobile app. Also fixes card dirty state issues. re #4487