summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-03-12 00:34:19 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-03-12 00:34:19 +0900
commitc932f7a25bfd0944b21fc026a647fa1d04750418 (patch)
treeb10f9725ab30b094b1ac95ba980881e6d9a09888 /src/client
parentRefactor: Extract downloadTextFile function (diff)
downloadmisskey-c932f7a25bfd0944b21fc026a647fa1d04750418.tar.gz
misskey-c932f7a25bfd0944b21fc026a647fa1d04750418.tar.bz2
misskey-c932f7a25bfd0944b21fc026a647fa1d04750418.zip
Resolve #1736
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/settings/profile.vue3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/settings/profile.vue b/src/client/app/common/views/components/settings/profile.vue
index d5ae8591ae..97ad7dec6b 100644
--- a/src/client/app/common/views/components/settings/profile.vue
+++ b/src/client/app/common/views/components/settings/profile.vue
@@ -101,7 +101,7 @@
</ui-select>
<ui-horizon-group class="fit-bottom">
<ui-button @click="doExport()"><fa :icon="faDownload"/> {{ $t('export') }}</ui-button>
- <ui-button @click="doImport()" :disabled="!['user-lists'].includes(exportTarget)"><fa :icon="faUpload"/> {{ $t('import') }}</ui-button>
+ <ui-button @click="doImport()" :disabled="!['following', 'user-lists'].includes(exportTarget)"><fa :icon="faUpload"/> {{ $t('import') }}</ui-button>
</ui-horizon-group>
</div>
</section>
@@ -301,6 +301,7 @@ export default Vue.extend({
doImport() {
this.$chooseDriveFile().then(file => {
this.$root.api(
+ this.exportTarget == 'following' ? 'i/import-following' :
this.exportTarget == 'user-lists' ? 'i/import-user-lists' :
null, {
fileId: file.id