Merge branch '287-import-size' into 'develop'

Resolve "Display bug in Activity" Closes #287 See merge request funkwhale/funkwhale!236
2018-06-07 07:05:22 +00:00 · 2018-06-07 07:05:22 +00:00 · 0a7c719a46
parent b6fc0051fa 16718809f7
commit 0a7c719a46
2 changed files with 2 additions and 1 deletions
--- a/changes/changelog.d/287.enhancement
+++ b/changes/changelog.d/287.enhancement
@ -0,0 +1 @@
+Display file size in human format during file upload (#287)
--- a/front/src/components/library/import/FileUpload.vue
+++ b/front/src/components/library/import/FileUpload.vue
@ -50,7 +50,7 @@
      <tbody>
        <tr v-for="(file, index) in files" :key="file.id">
          <td>{{ file.name }}</td>
-          <td>{{ file.size }}</td>
+          <td>{{ file.size | humanSize }}</td>
          <td>
            <span v-if="file.error" class="ui red label">
              {{ file.error }}
				`@ -0,0 +1 @@`
				`Display file size in human format during file upload (#287)`