added org abbreviation to 'Guidance' sections and added customized ex… #1347
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
Contributor
briri
commented
Apr 4, 2018
•
briri
commented
- Removed example answer from guidances section since its never used (query looks only for guidance type annotations)
- Added Org abbreviation to 'Guidance' label when the template is customized Add Funder & Org abbreviation before "Guidance" word in customised templates #1343
- Used existing model method to get customization example answer and display it underneath the template's original example answer (would be better to refactor into a single query later) Customisation example answers do not appear when editing plan #1344
- Updated 'Answer locked by another user' section to exclude reshowing example answers since they appear below the main answer
…ample answers updated locking logic
jollopre
reviewed
Apr 5, 2018
| <% if example_answer.present? %> | ||
| <dt><%= _('Example answer') %></dt> | ||
| <dd><%= raw example_answer.text %><dd> | ||
| <% end %> | ||
| <% if guidance.present? %> |
There was a problem hiding this comment.
this if is no longer needed
jollopre
reviewed
Apr 5, 2018
| </span> | ||
| <div class="panel-body"> | ||
| <%= raw annotation.text %> | ||
| <% annotations = [question.first_example_answer] %> |
There was a problem hiding this comment.
This is workable but I don't think is understandable at a glance. A more simplistic approach would be question.annotations.where(type: Annotation.types[:example_answer]) which would bring both example answers in one go. Obviously we should move data access to the controllers or model
jollopre
reviewed
Apr 5, 2018
| @@ -1,4 +1,4 @@ | |||
| <%# locals: { question, answer, readonly, locking } %> | |||
| <%# locals: { template, question, answer, readonly, locking } %> | |||
There was a problem hiding this comment.
this partial is used also for previewing a template, did you test if still works?
jollopre
approved these changes
Apr 5, 2018
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.