KG - Protocol Permissions Refactor (1.7.0) #404
Merged
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
added 12 commits
May 12, 2016 10:00
…s, etc. Bootstrapified service requests and started Edit Original changes. Fixing merge conflict
…tes, a few touch-ups to the bootstrap table
| @@ -55,6 +57,13 @@ $(document).ready -> | |||
| $.ajax | |||
| type: 'get' | |||
| url: "/dashboard/protocols/#{protocol_id}/display_requests" | |||
| success: (data) -> | |||
There was a problem hiding this comment.
Send the request, get the modal back through JSON and open it, then enable the bootstraptables and enable the selectpickers
| end | ||
|
|
||
| is_provider | ||
| def is_service_provider?(ssr) |
There was a problem hiding this comment.
Just refactored a few methods
kayla-glick
changed the title
added 7 commits
May 23, 2016 14:47
… destroy associated user
kayla-glick
changed the title
| @@ -457,7 +457,7 @@ | |||
| this.options.paginationVAlign === 'top' || this.options.paginationVAlign === 'both' ? | |||
| '<div class="fixed-table-pagination" style="clear: both;"></div>' : | |||
| '', | |||
| '<div class="fixed-table-container protocol-management-and-financial-view">', | |||
| '<div class="fixed-table-container">', | |||
There was a problem hiding this comment.
This did not serve a purpose in SPARC. It seems to be a copy-over from CWF
added 5 commits
May 24, 2016 15:23
kayla-glick
changed the title
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.
No description provided.