rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-06 01:08:21 +01:00
Code Issues Releases Activity

[bug] unable to search for projects (#230)

Browse Source
This commit is contained in:
Sylvain 2020-09-23 09:32:42 +02:00
parent f8b69b40e2
commit a8811afba3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# Changelog Fab-manager # Changelog Fab-manager
- Fix a bug: unable to run tests suite with run-tests.sh - Fix a bug: unable to run tests suite with run-tests.sh
- Fix a bug: unable to search for projects (#230)
- Updated coveralls gem to a supported version - Updated coveralls gem to a supported version
## v4.5.6 2020 September 1st ## v4.5.6 2020 September 1st

15
app/assets/javascripts/controllers/projects.js.erb
View File

@ -334,7 +334,7 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
$scope.search.component_id = undefined; $scope.search.component_id = undefined;
$scope.search.theme_id = undefined; $scope.search.theme_id = undefined;
$scope.setUrlQueryParams($scope.search); $scope.setUrlQueryParams($scope.search);
return $scope.triggerSearch(); $scope.triggerSearch();
}; };
/** /**
@ -346,22 +346,22 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
if ($scope.openlab.searchOverWholeNetwork === true) { if ($scope.openlab.searchOverWholeNetwork === true) {
updateUrlParam('whole_network', 't'); updateUrlParam('whole_network', 't');
$scope.projectsPagination = new paginationService.Instance(OpenlabProject, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreOpenlabCallback); $scope.projectsPagination = new paginationService.Instance(OpenlabProject, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreOpenlabCallback);
return OpenlabProject.query({ q: $scope.search.q, page: currentPage, per_page: PROJECTS_PER_PAGE }, function (projectsPromise) { OpenlabProject.query({ q: $scope.search.q, page: currentPage, per_page: PROJECTS_PER_PAGE }, function (projectsPromise) {
if (projectsPromise.errors) { if (projectsPromise.errors) {
growl.error(_t('app.public.projects_list.openlab_search_not_available_at_the_moment')); growl.error(_t('app.public.projects_list.openlab_search_not_available_at_the_moment'));
$scope.openlab.searchOverWholeNetwork = false; $scope.openlab.searchOverWholeNetwork = false;
return $scope.triggerSearch(); $scope.triggerSearch();
} else { } else {
$scope.projectsPagination.totalCount = projectsPromise.meta.total; $scope.projectsPagination.totalCount = projectsPromise.meta.total;
return $scope.projects = normalizeProjectsAttrs(projectsPromise.projects); $scope.projects = normalizeProjectsAttrs(projectsPromise.projects);
} }
}); });
} else { } else {
updateUrlParam('whole_network', 'f'); updateUrlParam('whole_network', 'f');
$scope.projectsPagination = new paginationService.Instance(Project, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreCallback, 'search'); $scope.projectsPagination = new paginationService.Instance(Project, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreCallback, 'search');
return Project.search({ search: $scope.search, page: currentPage, per_page: PROJECTS_PER_PAGE }, function (projectsPromise) { Project.search({ search: $scope.search, page: currentPage, per_page: PROJECTS_PER_PAGE }, function (projectsPromise) {
$scope.projectsPagination.totalCount = projectsPromise.meta.total; $scope.projectsPagination.totalCount = projectsPromise.meta.total;
return $scope.projects = projectsPromise.projects; $scope.projects = projectsPromise.projects;
}); });
} }
}; };
@ -388,7 +388,8 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
updateUrlParam('from', search.from); updateUrlParam('from', search.from);
updateUrlParam('theme_id', search.theme_id); updateUrlParam('theme_id', search.theme_id);
updateUrlParam('component_id', search.component_id); updateUrlParam('component_id', search.component_id);
return updateUrlParam('machine_id', search.machine_id); updateUrlParam('machine_id', search.machine_id);
return true;
}; };
/* PRIVATE SCOPE */ /* PRIVATE SCOPE */