Backport ability to enable/disable file attachments in issuable form
This commit is contained in:
parent
3d67018c16
commit
eb5333970c
6 changed files with 72 additions and 3 deletions
|
@ -102,6 +102,11 @@ export default {
|
|||
required: false,
|
||||
default: 'issue',
|
||||
},
|
||||
canAttachFile: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
const store = new Store({
|
||||
|
@ -234,6 +239,7 @@ export default {
|
|||
:project-path="projectPath"
|
||||
:project-namespace="projectNamespace"
|
||||
:show-delete-button="showDeleteButton"
|
||||
:can-attach-file="canAttachFile"
|
||||
/>
|
||||
<div v-else>
|
||||
<title-component
|
||||
|
|
|
@ -17,6 +17,11 @@
|
|||
type: String,
|
||||
required: true,
|
||||
},
|
||||
canAttachFile: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
markdownField,
|
||||
|
@ -36,7 +41,8 @@
|
|||
</label>
|
||||
<markdown-field
|
||||
:markdown-preview-path="markdownPreviewPath"
|
||||
:markdown-docs-path="markdownDocsPath">
|
||||
:markdown-docs-path="markdownDocsPath"
|
||||
:can-attach-file="canAttachFile">
|
||||
<textarea
|
||||
id="issue-description"
|
||||
class="note-textarea js-gfm-input js-autosize markdown-area"
|
||||
|
|
|
@ -41,6 +41,11 @@
|
|||
required: false,
|
||||
default: true,
|
||||
},
|
||||
canAttachFile: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true,
|
||||
},
|
||||
},
|
||||
components: {
|
||||
lockedWarning,
|
||||
|
@ -83,7 +88,8 @@
|
|||
<description-field
|
||||
:form-state="formState"
|
||||
:markdown-preview-path="markdownPreviewPath"
|
||||
:markdown-docs-path="markdownDocsPath" />
|
||||
:markdown-docs-path="markdownDocsPath"
|
||||
:can-attach-file="canAttachFile" />
|
||||
<edit-actions
|
||||
:form-state="formState"
|
||||
:can-destroy="canDestroy"
|
||||
|
|
|
@ -25,6 +25,11 @@
|
|||
type: String,
|
||||
required: false,
|
||||
},
|
||||
canAttachFile: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
@ -129,6 +134,7 @@
|
|||
<markdown-toolbar
|
||||
:markdown-docs-path="markdownDocsPath"
|
||||
:quick-actions-docs-path="quickActionsDocsPath"
|
||||
:can-attach-file="canAttachFile"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -9,6 +9,11 @@
|
|||
type: String,
|
||||
required: false,
|
||||
},
|
||||
canAttachFile: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
@ -41,7 +46,10 @@
|
|||
are supported
|
||||
</template>
|
||||
</div>
|
||||
<span class="uploading-container">
|
||||
<span
|
||||
v-if="canAttachFile"
|
||||
class="uploading-container"
|
||||
>
|
||||
<span class="uploading-progress-container hide">
|
||||
<i
|
||||
class="fa fa-file-image-o toolbar-button-icon"
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
import Vue from 'vue';
|
||||
import toolbar from '~/vue_shared/components/markdown/toolbar.vue';
|
||||
import mountComponent from '../../../helpers/vue_mount_component_helper';
|
||||
|
||||
describe('toolbar', () => {
|
||||
let vm;
|
||||
const Toolbar = Vue.extend(toolbar);
|
||||
const props = {
|
||||
markdownDocsPath: '',
|
||||
};
|
||||
|
||||
afterEach(() => {
|
||||
vm.$destroy();
|
||||
});
|
||||
|
||||
describe('user can attach file', () => {
|
||||
beforeEach(() => {
|
||||
vm = mountComponent(Toolbar, props);
|
||||
});
|
||||
|
||||
it('should render uploading-container', () => {
|
||||
expect(vm.$el.querySelector('.uploading-container')).not.toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe('user cannot attach file', () => {
|
||||
beforeEach(() => {
|
||||
vm = mountComponent(Toolbar, Object.assign({}, props, {
|
||||
canAttachFile: false,
|
||||
}));
|
||||
});
|
||||
|
||||
it('should not render uploading-container', () => {
|
||||
expect(vm.$el.querySelector('.uploading-container')).toBeNull();
|
||||
});
|
||||
});
|
||||
});
|
Loading…
Reference in a new issue