Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed interaction with the server share in the auto annotation plugin #468

Merged
merged 1 commit into from
Jun 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
});
Expand Down