Task/sapnamysore/tlt 1167/add resource link to urls#187
Open
sapnamysore wants to merge 9 commits intodevelopfrom
Open
Task/sapnamysore/tlt 1167/add resource link to urls#187sapnamysore wants to merge 9 commits intodevelopfrom
sapnamysore wants to merge 9 commits intodevelopfrom
Conversation
…nk_to_urls # By Yates, Elliott # Via elliottyates (3) and Yates, Elliott (1) * develop: adds CSRF protection to finalize tracks and delete tracks, updates unit tests, includes TODO for future refactoring adds TODO as per original PR #178 suggestions: reminder to refactor the CSRF-protected forms for copy experiment, delete experiment, delete IP to instead be AJAX calls fixes unit tests for copy experiment, delete experiment, delete IP after CSRF protection added adds CSRF protection to remaining non-angular side-effect-inducing endpoints: copy experiment, delete experiment, delete IP fixes Django at major version 1.7 Conflicts: ab_tool/templates/ab_tool/experiments_dashboard.html ab_tool/templates/ab_tool/modals.html **Resolved Conflicts
| "name": "experiment", "notes": "hi", "uniformRandom": True, | ||
| "csvUpload": False, | ||
| "tracks": [{"id": None, "weighting": None, "name": "A"}] | ||
| "tracks": [{"id": None, "weighting": None, "name": "A", "resource_link_id": self.resource_link_id}] |
Contributor
There was a problem hiding this comment.
Should this match the experiment declaration on line 111, below? I'm not sure an element of tracks needs to have this key.
This file contains hidden or 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
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.
This PR contains changes in the AB tool to add resource_link_id. It has changes to add resource_link_id to urls , and to all the methods in views, templates and js ...
These changes were in preparation for a certain way of implementing the solution for the multiple launch issue(with some tweaks to django_auth_lti) . That solution is currently going to be re-evaluated.
In the meantime these changes can live in it's own feature branch but it would be good to get this code reviewed in case we go with this approach.