Commit 70db6e14 authored by Sascha's avatar Sascha

Merge branch 'master' into 'develop'

Master

See merge request !76
parents 40b7fe32 7c0300a6
......@@ -97,6 +97,7 @@
};
var onError = function(data) {
console.log(data);
if (data.status === 401) {
$rootScope.$broadcast('force_logout', '');
}
......
......@@ -147,6 +147,7 @@
* @param {uuid} parent_datastore_id THe parent's datastore id
*/
var update_paths_with_data = function(datastore, path, content, parent_share_rights, parent_share_id, parent_datastore_id) {
var path_copy = path.slice();
var search = find_in_datastore(path_copy, datastore);
var obj = search[0][search[1]];
......@@ -206,6 +207,10 @@
var read_share_helper = function (share_id, sub_datastore, path, parent_share_id, parent_datastore_id) {
var onSuccess = function (content) {
if (typeof(content) === 'undefined') {
open_calls--;
return;
}
all_share_data[share_id] = content;
update_paths_with_data(datastore, path, content, parent_share_rights, parent_share_id, parent_datastore_id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment