diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f9e15a6082bc56d80eac5d459c84fa5107be3f2..c891694c15cb01b26caddf09382629905e3f8261 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.4.2] - 2019-06-03 +### Fixed +- Fixed interaction with the server share in the auto annotation plugin + ## [0.4.1] - 2019-05-14 ### Fixed - JavaScript syntax incompatibility with Google Chrome versions less than 72 diff --git a/cvat/apps/auto_annotation/static/auto_annotation/js/dashboardPlugin.js b/cvat/apps/auto_annotation/static/auto_annotation/js/dashboardPlugin.js index 2aba511b846819847f9ebbd4cb11c172b0f5cd64..dd0e7b57a1c8d3f1f2725b2efb245b1b2fa8b87e 100644 --- a/cvat/apps/auto_annotation/static/auto_annotation/js/dashboardPlugin.js +++ b/cvat/apps/auto_annotation/static/auto_annotation/js/dashboardPlugin.js @@ -300,10 +300,25 @@ class AutoAnnotationModelManagerView { this.shareSelector.removeClass('hidden'); this.shareBrowseTree.jstree({ core: { - data: { - url: 'get_share_nodes', - data: node => ({ id: node.id }), - }, + data: async function (obj, callback) { + let url = '/api/v1/server/share'; + + if (obj.id != '#') { + url += `?directory=${obj.id.substr(2)}`; + } + + const response = await $.get(url); + const files = Array.from(response, (element) => { + return { + id: `${obj.id}/${element.name}`, + children: element.type === 'DIR', + text: element.name, + icon: element.type === 'DIR' ? 'jstree-folder' : 'jstree-file', + } + }); + + callback.call(this, files); + } }, plugins: ['checkbox', 'sort'], });