Commit 5e7d1e33 authored by Nezael's avatar Nezael
Browse files

State provider conflict solved

Added paperboard- prefix to the element id
parent f102c904
......@@ -415,14 +415,11 @@ angular.module('myApp', [
}
}
})
//$stateProvider.state({url:'/p/:projectName/workshops/new', templateUrl: __root+'components/projects/workshops/new.html', controller: 'NewWorkshopCtrl'})
// Page quand on clique sur "rejoindre un atelier"
$stateProvider.state('project.workshops.details', {
url: '/:elementId',
templateUrl: __root + 'components/projects/workshops/details.html',
controller: 'DetailsWorkshopCtrl',
controllerAs: "detailsWorkshopCtrl",
$stateProvider.state('project.workshops.paperboard', {
url: '/paperboard-:elementId',
templateUrl: __root + 'components/projects/workshops/paperboard.html',
controller: 'PaperBoardCtrl',
controllerAs: "paperBoardCtrl",
params: {
section: {
elementId: true,
......@@ -430,12 +427,13 @@ angular.module('myApp', [
}
}
})
$stateProvider.state('project.workshops.paperboard', {
//$stateProvider.state({url:'/p/:projectName/workshops/new', templateUrl: __root+'components/projects/workshops/new.html', controller: 'NewWorkshopCtrl'})
// Page quand on clique sur "rejoindre un atelier"
$stateProvider.state('project.workshops.details', {
url: '/:elementId',
templateUrl: __root + 'components/projects/workshops/paperboard.html',
controller: 'PaperBoardCtrl',
controllerAs: "paperBoardCtrl",
templateUrl: __root + 'components/projects/workshops/details.html',
controller: 'DetailsWorkshopCtrl',
controllerAs: "detailsWorkshopCtrl",
params: {
section: {
elementId: true,
......@@ -444,6 +442,8 @@ angular.module('myApp', [
}
})
$stateProvider.state('project.workshops.overview', {
url: '/overview/:section',
templateUrl: __root + 'components/projects/workshops/overview.html',
......
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