Skip to content
Snippets Groups Projects
Verified Commit 08e28aa6 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 'release/0.3.1'

parents c8a2ae42 0b8f61b2
No related branches found
No related tags found
No related merge requests found
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<div class="ui disabled radio checkbox"> <div class="ui radio checkbox">
<input type="radio" id="upload" value="upload" v-model="currentSource" disabled> <input type="radio" id="upload" value="upload" v-model="currentSource">
<label for="upload">File upload</label> <label for="upload">File upload</label>
</div> </div>
</div> </div>
...@@ -84,8 +84,14 @@ ...@@ -84,8 +84,14 @@
</div> </div>
</div> </div>
<div v-if="currentStep === 2"> <div v-if="currentStep === 2">
<file-upload
ref="import"
v-if="currentSource == 'upload'"
></file-upload>
<component <component
ref="import" ref="import"
v-if="currentSource == 'external'"
:metadata="metadata" :metadata="metadata"
:is="importComponent" :is="importComponent"
:backends="backends" :backends="backends"
...@@ -119,6 +125,7 @@ import MetadataSearch from '@/components/metadata/Search' ...@@ -119,6 +125,7 @@ import MetadataSearch from '@/components/metadata/Search'
import ReleaseCard from '@/components/metadata/ReleaseCard' import ReleaseCard from '@/components/metadata/ReleaseCard'
import ArtistCard from '@/components/metadata/ArtistCard' import ArtistCard from '@/components/metadata/ArtistCard'
import ReleaseImport from './ReleaseImport' import ReleaseImport from './ReleaseImport'
import FileUpload from './FileUpload'
import ArtistImport from './ArtistImport' import ArtistImport from './ArtistImport'
import router from '@/router' import router from '@/router'
...@@ -130,7 +137,8 @@ export default { ...@@ -130,7 +137,8 @@ export default {
ArtistCard, ArtistCard,
ReleaseCard, ReleaseCard,
ArtistImport, ArtistImport,
ReleaseImport ReleaseImport,
FileUpload
}, },
props: { props: {
mbType: {type: String, required: false}, mbType: {type: String, required: false},
...@@ -142,7 +150,7 @@ export default { ...@@ -142,7 +150,7 @@ export default {
currentType: this.mbType || 'artist', currentType: this.mbType || 'artist',
currentId: this.mbId, currentId: this.mbId,
currentStep: 0, currentStep: 0,
currentSource: this.source || 'external', currentSource: '',
metadata: {}, metadata: {},
isImporting: false, isImporting: false,
importData: { importData: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment