mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-01-18 07:52:23 +01:00
Fix a bug: unable to switch OpenLab projets
This commit is contained in:
parent
516018254c
commit
ff230b5451
@ -287,7 +287,7 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
|
|||||||
// Is openLab enabled on the instance?
|
// Is openLab enabled on the instance?
|
||||||
$scope.openlab = {
|
$scope.openlab = {
|
||||||
projectsActive: openLabActive.isPresent,
|
projectsActive: openLabActive.isPresent,
|
||||||
searchOverWholeNetwork: false
|
searchOverWholeNetwork: settingsPromise.openlab_default === 'true'
|
||||||
};
|
};
|
||||||
|
|
||||||
// default search parameters
|
// default search parameters
|
||||||
@ -405,8 +405,10 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
|
|||||||
const initialize = function () {
|
const initialize = function () {
|
||||||
if ($location.$$search.whole_network === 'f') {
|
if ($location.$$search.whole_network === 'f') {
|
||||||
$scope.openlab.searchOverWholeNetwork = false;
|
$scope.openlab.searchOverWholeNetwork = false;
|
||||||
|
} else if ($location.$$search.whole_network === undefined) {
|
||||||
|
$scope.openlab.searchOverWholeNetwork = $scope.openlab.projectsActive && settingsPromise.openlab_default === 'true';
|
||||||
} else {
|
} else {
|
||||||
$scope.openlab.searchOverWholeNetwork = ($scope.openlab.projectsActive && settingsPromise.openlab_default === 'true') || false;
|
$scope.openlab.searchOverWholeNetwork = $scope.openlab.projectsActive;
|
||||||
}
|
}
|
||||||
return $scope.triggerSearch();
|
return $scope.triggerSearch();
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user