taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicate controller

stable
David Barragán Merino 2016-09-27 20:51:05 +02:00
parent de7baa1fb3
commit df22bcc021
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/coffee/app.coffee
View File

@ -76,6 +76,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
return originalWhen.call($routeProvider, path, route) return originalWhen.call($routeProvider, path, route)
# Home
$routeProvider.when("/", $routeProvider.when("/",
{ {
templateUrl: "home/home.html", templateUrl: "home/home.html",
@ -89,6 +90,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
} }
) )
# Discover
$routeProvider.when("/discover", $routeProvider.when("/discover",
{ {
templateUrl: "discover/discover-home/discover-home.html", templateUrl: "discover/discover-home/discover-home.html",
@ -110,6 +112,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
} }
) )
# My Projects
$routeProvider.when("/projects/", $routeProvider.when("/projects/",
{ {
templateUrl: "projects/listing/projects-listing.html", templateUrl: "projects/listing/projects-listing.html",
@ -123,16 +126,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
controllerAs: "vm" controllerAs: "vm"
} }
) )
# Project
$routeProvider.when("/blocked-project/:pslug/",
{
templateUrl: "projects/project/blocked-project.html",
loader: true,
controller: "Project",
controllerAs: "vm"
}
)
$routeProvider.when("/project/:pslug/", $routeProvider.when("/project/:pslug/",
{ {
templateUrl: "projects/project/project.html", templateUrl: "projects/project/project.html",
@ -152,6 +146,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
} }
) )
# Epics
$routeProvider.when("/project/:pslug/epics", $routeProvider.when("/project/:pslug/epics",
{ {
section: "epics", section: "epics",
@ -162,7 +157,6 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
} }
) )
# Epics
$routeProvider.when("/project/:pslug/epic/:epicref", $routeProvider.when("/project/:pslug/epic/:epicref",
{ {
templateUrl: "epic/epic-detail.html", templateUrl: "epic/epic-detail.html",
@ -485,6 +479,12 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven
) )
# Errors/Exceptions # Errors/Exceptions
$routeProvider.when("/blocked-project/:pslug/",
{
templateUrl: "projects/project/blocked-project.html",
loader: true,
}
)
$routeProvider.when("/error", $routeProvider.when("/error",
{templateUrl: "error/error.html"}) {templateUrl: "error/error.html"})
$routeProvider.when("/not-found", $routeProvider.when("/not-found",