link subject to submission in submission comment inbox
fixes CNVS-16948 test plan - view a submission comment in the submission comment inbox - ensure that the subject in the message detail view (right side display) links to the submission comment Change-Id: I2ea4bd8c44a52ff6a250b83638b4d9a2556617d0 Reviewed-on: https://gerrit.instructure.com/44541 Tested-by: Jenkins <jenkins@instructure.com> Product-Review: Janelle Seegmiller <jseegmiller@instructure.com> Reviewed-by: Brad Horrocks <bhorrocks@instructure.com> QA-Review: Steven Shepherd <sshepherd@instructure.com>
This commit is contained in:
parent
2a4f455f5f
commit
f2f74b92f1
|
@ -20,6 +20,7 @@ define [
|
||||||
if data.type == 'Submission'
|
if data.type == 'Submission'
|
||||||
data.for_submission = true
|
data.for_submission = true
|
||||||
data.subject = "#{data.course.name} - #{data.title}"
|
data.subject = "#{data.course.name} - #{data.title}"
|
||||||
|
data.subject_url = data.html_url
|
||||||
data.messages = data.submission_comments
|
data.messages = data.submission_comments
|
||||||
data.messages.reverse()
|
data.messages.reverse()
|
||||||
_.each data.messages, (message) ->
|
_.each data.messages, (message) ->
|
||||||
|
|
|
@ -1,9 +1,13 @@
|
||||||
<div>
|
<div>
|
||||||
<div class="message-header">
|
<div class="message-header">
|
||||||
<b class="subject" tabindex="-1" {{#if subject}}title="{{subject}}"{{/if}}>
|
<b class="subject" tabindex="-1" {{#if subject}}title="{{subject}}"{{/if}}>
|
||||||
{{#if subject}}
|
{{#if subject}}
|
||||||
{{subject}}
|
{{#if subject_url}}
|
||||||
|
<a href={{subject_url}}>{{subject}}</a>
|
||||||
{{else}}
|
{{else}}
|
||||||
|
{{subject}}
|
||||||
|
{{/if}}
|
||||||
|
{{else}}
|
||||||
({{#t "no_subject"}}No subject{{/t}})
|
({{#t "no_subject"}}No subject{{/t}})
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</b>
|
</b>
|
||||||
|
|
|
@ -68,7 +68,7 @@ module Api::V1::Submission
|
||||||
end
|
end
|
||||||
|
|
||||||
if includes.include?("html_url")
|
if includes.include?("html_url")
|
||||||
hash['html_url'] = course_assignment_submission_url(submission.context.id, assignment.id, user.id)
|
hash['html_url'] = course_assignment_submission_url(submission.context.id, assignment.id, submission.user.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
if includes.include?("user")
|
if includes.include?("user")
|
||||||
|
@ -203,4 +203,3 @@ module Api::V1::Submission
|
||||||
attachment
|
attachment
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue