User creation and Role assignment which also contains Richard's Resource layer update #313
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
…o role Conflicts: kolibri/core/assets/src/api_resource.js
…into user_creation
…its parent as prep. because we probably won't adapt this component to other usage.
This was referenced Jul 29, 2016
| @@ -27,36 +27,140 @@ class Model { | |||
| this.synced = false; | |||
|
|
|||
| // force IDs to always be strings - this should be changed on the server-side too | |||
| this.attributes[this.resource.idKey] = String(this.attributes[this.resource.idKey]); | |||
| if ('id' in data) { | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| model = new Model(data, this); | ||
| } else { | ||
| model = this.models[id]; | ||
| return null; |
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.
User creation - PR review updates
|
@rtibbles @66eli77 I'd like to merge this in so that folks can continue to be working off it. However I also want to make sure that any outstanding comments are taken into account eventually. Creating this Trello card as a reminder: https://trello.com/c/3f5ogNYr/307-follow-up-on-resource-persistence-related-pr |
| </div> | ||
| <div class="modal-body"> | ||
| <slot name="body"> | ||
| disappear in oblivion.. |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Merged
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 is uses the new Resource layer from #279, please move the conversation and future changes form #279 to this PR.