Commit b4ce726f authored by Sascha's avatar Sascha

Merge branch 'develop' into 'master'

Preparing v1.11.5

See merge request !117
parents 152d67f0 43ce724e
......@@ -526,6 +526,10 @@
parent_share_id = parent.share_id;
} else if(parent.hasOwnProperty("datastore_id")) {
parent_datastore_id = parent.datastore_id;
} else if(parent.hasOwnProperty("parent_datastore_id") && typeof(parent.parent_datastore_id) !== 'undefined') {
parent_datastore_id = parent.parent_datastore_id;
} else if(parent.hasOwnProperty("parent_share_id") && typeof(parent.parent_share_id) !== 'undefined') {
parent_share_id = parent.parent_share_id;
}
if (size === 0) {
......
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