File tree Expand file tree Collapse file tree 5 files changed +16
-7
lines changed
Expand file tree Collapse file tree 5 files changed +16
-7
lines changed Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ const MarkdownEditor = ({
114114 id = { field_name }
115115 fieldset = { false }
116116 field_data = { metadata . fields [ field_name ] }
117- value = { form_data [ field_name ] }
117+ value = { form_data [ field_name ] ?. markdown ? form_data [ field_name ] . markdown : form_data [ field_name ] }
118118 onChange = { handleChange }
119119 onSubmit = { ( e ) => {
120120 handleSave ( e )
Original file line number Diff line number Diff line change @@ -102,8 +102,6 @@ const RelatedTickets = ({
102102
103103 }
104104
105- related_ticket [ 'display_name' ] = '#' + String ( this_id . id )
106-
107105 return (
108106 < div style = { {
109107 display : 'inline-block'
Original file line number Diff line number Diff line change @@ -119,8 +119,19 @@ const TicketComment = ({
119119
120120 async function do_fetch ( ) {
121121
122+ let url = String ( comment_page_data . _urls . _self )
123+
124+ let url_tail = `/${ comment_page_data [ 'id' ] } `
125+
126+ if ( url . endsWith ( url_tail ) ) { // Remove the object id from end of URL
127+
128+ url = url . substr ( 0 , url . length - url_tail . length )
129+ }
130+
131+
132+
122133 await apiFetch (
123- comment_page_data . _urls . _self ,
134+ url ,
124135 null ,
125136 'OPTIONS'
126137 )
Original file line number Diff line number Diff line change @@ -219,7 +219,7 @@ const TicketCommentForm = ({
219219 id = 'body'
220220 class_name = 'fieldset-tester'
221221 onChange = { handleChange }
222- value = { form_data . body ? form_data . body : comment_data [ 'body' ] }
222+ value = { form_data . body ? form_data . body : comment_metadata . fields [ 'body' ] . type === 'Markdown' ? comment_data [ 'body' ] ?. markdown : comment_data [ 'body' ] }
223223 />
224224
225225 < hr />
Original file line number Diff line number Diff line change @@ -246,8 +246,8 @@ export default function FieldData({
246246 case 'Markdown' :
247247
248248 field_data = (
249- < RenderMarkdown env = { metadata . fields [ field_name ] . render ?? { } } >
250- { data_field }
249+ < RenderMarkdown env = { data_field . render ?? { } } >
250+ { data_field . markdown }
251251 </ RenderMarkdown >
252252 )
253253
You can’t perform that action at this time.
0 commit comments