Skip to content

Task/sapnamysore/tlt 1167/add resource link to urls#187

Open
sapnamysore wants to merge 9 commits intodevelopfrom
task/sapnamysore/tlt_1167/add_resource_link_to_urls
Open

Task/sapnamysore/tlt 1167/add resource link to urls#187
sapnamysore wants to merge 9 commits intodevelopfrom
task/sapnamysore/tlt_1167/add_resource_link_to_urls

Conversation

@sapnamysore
Copy link
Contributor

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.

sapnamysore and others added 9 commits April 6, 2015 15:50
…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}]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this match the experiment declaration on line 111, below? I'm not sure an element of tracks needs to have this key.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments