|
|
@@ -24618,19 +24618,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
window.location.href = newObj.link
|
|
|
}
|
|
|
closeRow($scope.roleList);
|
|
|
- newObj.selected = 'selected';
|
|
|
roopCall($scope.roleList, function (item) {
|
|
|
- // if ((!hasChildrenObj(item) && (item.roleId != $scope.currentObj.roleId))) {
|
|
|
- // item.collapsed = true;
|
|
|
- // }
|
|
|
- // if ($scope.currentObj.roleId == item.roleId && item.children.length) {
|
|
|
- // // angular.forEach(item.children, function (obj) {
|
|
|
- // // obj.col
|
|
|
- // // })
|
|
|
- // item.collapsed = false;
|
|
|
- // }
|
|
|
- item.collapsed = !hasChildrenObj(item) && (item.roleId != $scope.currentObj.roleId);
|
|
|
+ if (item.roleId == newObj.roleId) {
|
|
|
+ $scope.currentObj = item;
|
|
|
+ }
|
|
|
+ item.collapsed = !hasChildrenObj(item) && (item.roleId != newObj.roleId);
|
|
|
})
|
|
|
+ $scope.currentObj.selected = 'selected';
|
|
|
}
|
|
|
}, false);
|
|
|
}])
|