mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-01-18 07:52:23 +01:00
Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab
This commit is contained in:
commit
12bc556038
@ -155,7 +155,7 @@ Application.Controllers.controller "ProjectsController", ["$scope", "$state", 'P
|
|||||||
$scope.openlabAppId = Fablab.openlabAppId
|
$scope.openlabAppId = Fablab.openlabAppId
|
||||||
|
|
||||||
### PUBLIC SCOPE ###
|
### PUBLIC SCOPE ###
|
||||||
$scope.search = { q: ($location.$$search.q || ""), from: ($location.$$search.from || undefined), machine_id: ($location.$$search.machine_id || undefined), component_id: ($location.$$search.component_id || undefined), theme_id: ($location.$$search.theme_id || undefined) }
|
$scope.search = { q: ($location.$$search.q || ""), from: ($location.$$search.from || undefined), machine_id: (parseInt($location.$$search.machine_id) || undefined), component_id: (parseInt($location.$$search.component_id) || undefined), theme_id: (parseInt($location.$$search.theme_id) || undefined) }
|
||||||
|
|
||||||
## list of projects to display
|
## list of projects to display
|
||||||
$scope.projects = []
|
$scope.projects = []
|
||||||
|
Loading…
x
Reference in New Issue
Block a user