kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Further review changes

This commit is contained in:
Luke "Jared" Bennett 2017-10-02 10:34:40 +01:00
parent 00ee7a9f27
commit 59a6f15cd2
No known key found for this signature in database
GPG Key ID: 402ED51FB5D306C2
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/notes/components/issue_comment_form.vue
View File

@ -266,9 +266,9 @@
<div class="error-alert"></div>
<issue-warning
v-if="hasIssueWarning(getIssueData)"
:is-locked="isIssueLocked(getIssueData)"
:is-confidential="isIssueConfidential(getIssueData)"
v-if="hasWarning(getIssueData)"
:is-locked="isLocked(getIssueData)"
:is-confidential="isConfidential(getIssueData)"
/>
<markdown-field
@ -276,7 +276,6 @@
:markdown-docs-path="markdownDocsPath"
:quick-actions-docs-path="quickActionsDocsPath"
:add-spacing-classes="false"
:is-confidential-issue="isIssueConfidential(getIssueData)"
ref="markdownField">
<textarea
id="note-body"

6
app/assets/javascripts/notes/components/issue_note_form.vue
View File

@ -129,9 +129,9 @@
class="edit-note common-note-form js-quick-submit gfm-form">
<issue-warning
v-if="hasIssueWarning(getIssueData)"
:is-locked="isIssueLocked(getIssueData)"
:is-confidential="isIssueConfidential(getIssueData)"
v-if="hasWarning(getIssueData)"
:is-locked="isLocked(getIssueData)"
:is-confidential="isConfidential(getIssueData)"
/>
<markdown-field

8
app/assets/javascripts/notes/mixins/issuable_state.js
View File

@ -1,15 +1,15 @@
export default {
methods: {
isIssueConfidential(issue) {
isConfidential(issue) {
return !!issue.confidential;
},
isIssueLocked(issue) {
isLocked(issue) {
return !!issue.discussion_locked;
},
hasIssueWarning(issue) {
return this.isIssueConfidential(issue) || this.isIssueLocked(issue);
hasWarning(issue) {
return this.isConfidential(issue) || this.isLocked(issue);
},
},
};