Commit bf01775a authored by Sascha's avatar Sascha

Merge branch 'develop' into 'master'

Preparing v1.8.4

See merge request !101
parents d3149095 a571f23e
...@@ -143,6 +143,12 @@ ...@@ -143,6 +143,12 @@
} else { } else {
path.push(nodeScope.node[property]); path.push(nodeScope.node[property]);
} }
while (nodeScope.$parent && nodeScope.$parent.node) {
if (!nodeScope.node.hasOwnProperty('id') || !nodeScope.$parent.node.hasOwnProperty('id') || nodeScope.node.id !== nodeScope.$parent.node.id) {
break;
}
nodeScope = nodeScope.$parent;
}
nodeScope = nodeScope.$parent; nodeScope = nodeScope.$parent;
} }
return path.reverse(); return path.reverse();
...@@ -293,7 +299,6 @@ ...@@ -293,7 +299,6 @@
if (collapsible) { if (collapsible) {
controller.toggleExpanded(scope.node); controller.toggleExpanded(scope.node);
} }
controller.selectNode(scope.node, getPropertyPath(), getPropertyPath(idProperty)); controller.selectNode(scope.node, getPropertyPath(), getPropertyPath(idProperty));
}; };
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
var on_open = function(dropdown_menu_id) { var on_open = function(dropdown_menu_id) {
if (opened_dropdown_menu !== '') { if (opened_dropdown_menu !== '') {
angular.element('#' + opened_dropdown_menu).parent().removeClass('open'); //angular.element('#' + opened_dropdown_menu).parent().removeClass('open');
} }
opened_dropdown_menu = dropdown_menu_id; opened_dropdown_menu = dropdown_menu_id;
}; };
......
...@@ -832,4 +832,4 @@ ...@@ -832,4 +832,4 @@
app.factory("managerWidget", ['$rootScope', '$window', '$uibModal', 'managerDatastorePassword', 'managerShare', 'managerSecret', app.factory("managerWidget", ['$rootScope', '$window', '$uibModal', 'managerDatastorePassword', 'managerShare', 'managerSecret',
'managerShareLink', 'managerSecretLink', 'itemBlueprint', 'cryptoLibrary', managerWidget]); 'managerShareLink', 'managerSecretLink', 'itemBlueprint', 'cryptoLibrary', managerWidget]);
}(angular)); }(angular));
\ No newline at end of file
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
it('on_share_moved_with_datastore', inject(function (managerShareLink) { it('on_share_moved_with_datastore', inject(function (managerShareLink) {
var link_id = 'f1654f03-3415-4cd8-ad49-960300636f5f'; var link_id = 'f1654f03-3415-4cd8-ad49-960300636f5f';
var new_parent_share_id = null; var new_parent_share_id = undefined;
var new_parent_datastore_id = '6cb1714c-e6ec-4fec-9203-2904171539b3'; var new_parent_datastore_id = '6cb1714c-e6ec-4fec-9203-2904171539b3';
// fake datastore // fake datastore
var parent = { var parent = {
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
var link_id = '0838264a-5d7b-4a5f-9150-09890c5dfdea'; var link_id = '0838264a-5d7b-4a5f-9150-09890c5dfdea';
var new_parent_share_id = 'b765577c-5183-4ef1-913f-3571d6a3c918'; var new_parent_share_id = 'b765577c-5183-4ef1-913f-3571d6a3c918';
var new_parent_datastore_id = null; var new_parent_datastore_id = undefined;
// fake datastore // fake datastore
var parent = { var parent = {
'share_id': new_parent_share_id 'share_id': new_parent_share_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