Fix double node-adding bug

jonboiser · Nov 22, 2017 · a5c0ac8 · a5c0ac8
1 parent 2209afd
commit a5c0ac8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/...management/assets/src/device_management/views/select-content-page/content-tree-viewer.vue b/...management/assets/src/device_management/views/select-content-page/content-tree-viewer.vue
@@ -144,8 +144,9 @@
         } else {
           if (this.nodeCompletesParent(node)) {
             promise = this.addNodeForTransfer(sanitizeNode(this.annotatedTopicNode));
+          } else {
+            promise = this.addNodeForTransfer(sanitized);
           }
-          promise = this.addNodeForTransfer(sanitized);
         }
         return promise.then(() => {
           this.disableAll = false;

diff --git a/kolibri/plugins/management/assets/src/device_management/views/select-content-page/index.vue b/kolibri/plugins/management/assets/src/device_management/views/select-content-page/index.vue
@@ -31,7 +31,7 @@
       </section>
 
       <section
-        v-if="channelOnDevice.version"
+        v-if="channelOnDevice.on_device_resources > 0"
         class="updates"
       >
         <div

diff --git a/...lugins/management/assets/src/device_management/views/select-content-page/treeViewUtils.js b/...lugins/management/assets/src/device_management/views/select-content-page/treeViewUtils.js
@@ -26,7 +26,6 @@ export const CheckboxTypes = {
 const isAncestorOf = (a, b) => find(b.path, { pk: a.pk });
 const isDescedantOf = flip(isAncestorOf);
 const sumTotalResources = sumBy('total_resources');
-// TODO name change!!!
 const sumOnDeviceResources = sumBy('on_device_resources');
 
 /**
@@ -41,7 +40,6 @@ const sumOnDeviceResources = sumBy('on_device_resources');
  *
  */
 export function annotateNode(node, selectedNodes) {
-  // TODO needs to be renamed!!!
   const { on_device_resources, total_resources } = node;
   const isIncluded = find(selectedNodes.included, { pk: node.pk });
   const isOmitted = find(selectedNodes.omitted, { pk: node.pk });