Merge pull request #10767 from rtibbles/peer_to_peer

Fixes for peer to peer import
learningequality · Jun 5, 2023 · 70842ee · 70842ee
2 parents 54927e4 + d5574ce
commit 70842ee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
@@ -1,7 +1,7 @@
 <template>
 
   <ImmersivePage
-    :appBarTitle="toolbarTitle()"
+    :appBarTitle="toolbarTitle"
     :route="backRoute"
   >
     <KPageContainer class="device-container">
@@ -265,6 +265,19 @@
             return '';
         }
       },
+      toolbarTitle() {
+        switch (this.transferType) {
+          case TransferTypes.LOCALIMPORT:
+            return this.$tr('importFromDisk', { driveName: this.selectedDrive.name });
+          case TransferTypes.PEERIMPORT:
+            return this.$tr('importFromPeer', {
+              deviceName: this.selectedPeer.device_name || this.selectedPeer.nickname,
+              address: this.selectedPeer.base_url,
+            });
+          default:
+            return this.$tr('importFromKolibriStudio');
+        }
+      },
       channelsAreLoading() {
         return this.status === 'LOADING_CHANNELS_FROM_KOLIBRI_STUDIO';
       },
@@ -299,19 +312,6 @@
       }
     },
     methods: {
-      toolbarTitle(transferType) {
-        switch (transferType) {
-          case TransferTypes.LOCALIMPORT:
-            return this.$tr('importFromDisk', { driveName: this.selectedDrive.name });
-          case TransferTypes.PEERIMPORT:
-            return this.$tr('importFromPeer', {
-              deviceName: this.selectedPeer.device_name || this.selectedPeer.nickname,
-              address: this.selectedPeer.base_url,
-            });
-          default:
-            return this.$tr('importFromKolibriStudio');
-        }
-      },
       channelIsOnDevice(channel) {
         const match = this.installedChannelsWithResources.find(({ id }) => id === channel.id);
         return Boolean(match);

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/api.js b/kolibri/plugins/device/assets/src/views/SelectContentPage/api.js
@@ -13,7 +13,7 @@ export function startImportTask(params) {
 
   if (importSource.type === 'peer' || importSource.type === 'studio') {
     if (importSource.id) {
-      taskParams.peer_id = importSource.id;
+      taskParams.peer = importSource.id;
     }
     taskParams.type = TaskTypes.REMOTECONTENTIMPORT;
   } else if (importSource.type === 'drive') {