Sj empty protocol admin view #124
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
… dashboard, as new filter option [#140144393]
kayla-glick
reviewed
Mar 1, 2017
| @@ -288,7 +296,7 @@ def unique_rm_id_to_protocol | |||
| sort_order = arr[1] | |||
| case sort_name | |||
| when 'id' | |||
| order("id #{sort_order.upcase}") | |||
| order("protocols.id #{sort_order.upcase}") | |||
There was a problem hiding this comment.
Looks like this might conflict with #125 @Stuart-Johnson @jwiel86
There was a problem hiding this comment.
@kyle-glick @jwiel86 Yeah, It does I think. I had to change this because just 'id' was causing an ambiguity error if the initial query had any eager loading. I'm not sure, but it looks like Hanna's pull request also addresses this with the 'protocols.id'. I think the best thing would be to merge hers in first, then I'll address conflicts with mine, and make sure it still works.
There was a problem hiding this comment.
@kyle-glick @jwiel86 After investigation, looks like this shouldn't actually conflict with Hanna's stuff. Should be fine.
jwiel86
approved these changes
Mar 1, 2017
wtholt
approved these changes
Mar 2, 2017
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.
Allowing super users (any super users) to view any protocol without SUB service requests. This covers both the authorization to view them, and adding an "empty protocols" option to dashboard if you are a super user. [#140144393]