BigW Consortium Gitlab

Commit d2cfd406 by Filipa Lacerda

Fix edit text

parent ffef1669
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<textarea <textarea
id="note-body" id="note-body"
name="note[note]" name="note[note]"
class="note-textarea js-gfm-input js-autosize markdown-area" class="note-textarea js-gfm-input js-autosize markdown-area js-note-text"
data-supports-slash-commands="true" data-supports-slash-commands="true"
data-supports-quick-actions="true" data-supports-quick-actions="true"
aria-label="Description" aria-label="Description"
......
<script> <script>
/* global Flash */ /* global Flash */
import { mapActions } from 'vuex'; import { mapActions, mapMutations } from 'vuex';
import { TOGGLE_DISCUSSION } from '../stores/mutation_types'; import { TOGGLE_DISCUSSION } from '../stores/mutation_types';
import { SYSTEM_NOTE } from '../constants'; import { SYSTEM_NOTE } from '../constants';
import issueNote from './issue_note.vue'; import issueNote from './issue_note.vue';
...@@ -129,13 +129,13 @@ ...@@ -129,13 +129,13 @@
:note-id="discussion.id" :note-id="discussion.id"
:include-toggle="true" :include-toggle="true"
:toggle-handler="toggleDiscussion" :toggle-handler="toggleDiscussion"
actionText="started a discussion" action-text="started a discussion"
/> />
<issue-note-edited-text <issue-note-edited-text
v-if="note.last_updated_by" v-if="note.last_updated_by"
:edited-at="note.last_updated_at" :edited-at="note.last_updated_at"
:edited-by="note.last_updated_by" :edited-by="note.last_updated_by"
actionText="Last updated" action-text="Last updated"
className="discussion-headline-light js-discussion-headline" /> className="discussion-headline-light js-discussion-headline" />
</div> </div>
</div> </div>
......
...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
<template> <template>
<div :class="className"> <div :class="className">
<span>{{actionText}} </span> {{actionText}}
<span> by </span>
<a
:href="editedBy.path"
class="author_link">
<span>{{editedBy.name}}</span>
</a>
<time-ago-tooltip <time-ago-tooltip
:time="editedAt" :time="editedAt"
tooltip-placement="bottom" tooltip-placement="bottom"
/> />
by
<a
:href="editedBy.path"
class="author_link">
{{editedBy.name}}
</a>
</div> </div>
</template> </template>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
const endpoint = this.notesById[noteId].toggle_award_path; const endpoint = this.notesById[noteId].toggle_award_path;
this.toggleAward({ endpoint, awardName, noteId }) this.toggleAward({ endpoint, awardName, noteId })
.catch(() => {new Flash('Something went wrong on our end.')}); .catch(() => Flash('Something went wrong on our end.'));
}); });
$(document).on('issuable:change', (e, isClosed) => { $(document).on('issuable:change', (e, isClosed) => {
......
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