Optimizations #241
Merged
Optimizations #241
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
…tion into serializers # Conflicts: # contentcuration/contentcuration/models.py # contentcuration/contentcuration/serializers.py # contentcuration/contentcuration/static/js/edit_channel/import/hbtemplates/import_list_item.handlebars # contentcuration/contentcuration/urls.py # contentcuration/contentcuration/views.py
…into serializers # Conflicts: # contentcuration/contentcuration/views.py
…ation into serializers # Conflicts: # contentcuration/contentcuration/models.py
…curation into serializers # Conflicts: # contentcuration/contentcuration/urls.py # contentcuration/contentcuration/view/file_views.py # contentcuration/contentcuration/view/node_views.py
jamalex
reviewed
May 1, 2017
| @@ -377,29 +378,43 @@ class ContentNode(MPTTModel, models.Model): | |||
| objects = TreeManager() | |||
|
|
|||
| def get_original_node(self): | |||
|
|
|||
| key = "original_channel_{}".format(self.original_source_node_id or self.pk) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
jamalex
reviewed
May 1, 2017
|
|
||
| def get_channel(self): | ||
| root = self.get_root() | ||
| channel = root.channel_main or root.channel_trash or root.channel_language or root.channel_previous | ||
| channel = root.channel_main or root.channel_trash or root.channel_staging or root.channel_previous | ||
| if channel: | ||
| return channel.first() |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
…curation into serializers # Conflicts: # contentcuration/contentcuration/static/js/edit_channel/move/views.js
jamalex
requested changes
May 2, 2017
| return original_channel.main_tree.get_descendants().filter(node_id=self.original_source_node_id).first() or self | ||
|
|
||
| return self.original_node or self | ||
| original_node = original_channel.main_tree.get_descendants().filter(node_id=self.original_source_node_id).first() or self |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
|
||
| return new_node | ||
|
|
||
| def _duplicate_node(node, sort_order=None, parent=None, channel_id=None): |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
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.
Improves loading by 5x
Need to merge #238, #239, and #240 first
Includes following optimizations: