Commit 32cc246f authored by Phil Hughes's avatar Phil Hughes

Fixed EE differences in note_body.vue

parent 34f68b3e
<script> <script>
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import $ from 'jquery'; import $ from 'jquery';
import getDiscussion from 'ee_else_ce/notes/mixins/get_discussion';
import noteEditedText from './note_edited_text.vue'; import noteEditedText from './note_edited_text.vue';
import noteAwardsList from './note_awards_list.vue'; import noteAwardsList from './note_awards_list.vue';
import noteAttachment from './note_attachment.vue'; import noteAttachment from './note_attachment.vue';
...@@ -16,7 +17,7 @@ export default { ...@@ -16,7 +17,7 @@ export default {
noteForm, noteForm,
Suggestions, Suggestions,
}, },
mixins: [autosave], mixins: [autosave, getDiscussion],
props: { props: {
note: { note: {
type: Object, type: Object,
...@@ -76,8 +77,8 @@ export default { ...@@ -76,8 +77,8 @@ export default {
renderGFM() { renderGFM() {
$(this.$refs['note-body']).renderGFM(); $(this.$refs['note-body']).renderGFM();
}, },
handleFormUpdate(note, parentElement, callback) { handleFormUpdate(note, parentElement, callback, resolveDiscussion) {
this.$emit('handleFormUpdate', note, parentElement, callback); this.$emit('handleFormUpdate', note, parentElement, callback, resolveDiscussion);
}, },
formCancelHandler(shouldConfirm, isDirty) { formCancelHandler(shouldConfirm, isDirty) {
this.$emit('cancelForm', shouldConfirm, isDirty); this.$emit('cancelForm', shouldConfirm, isDirty);
...@@ -111,6 +112,8 @@ export default { ...@@ -111,6 +112,8 @@ export default {
:line="line" :line="line"
:note="note" :note="note"
:help-page-path="helpPagePath" :help-page-path="helpPagePath"
:discussion="discussion"
:resolve-discussion="note.resolve_discussion"
@handleFormUpdate="handleFormUpdate" @handleFormUpdate="handleFormUpdate"
@cancelForm="formCancelHandler" @cancelForm="formCancelHandler"
/> />
......
export default {
computed: {
discussion() {
return {};
},
},
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment