From 710589d5df313ee3adb5f80b045dab15e47ad11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jesus.espino@kaleidos.net>
Date: Thu, 28 Aug 2014 11:56:38 +0200
Subject: [PATCH] Fixed issue #789: Now on unresolved objects redirect user to
 the 404 page.

---
 app/coffee/modules/admin/memberships.coffee             | 4 ++++
 app/coffee/modules/admin/project-profile.coffee         | 4 ++++
 app/coffee/modules/admin/project-values.coffee          | 4 ++++
 app/coffee/modules/admin/roles.coffee                   | 4 ++++
 app/coffee/modules/backlog/main.coffee                  | 4 ++++
 app/coffee/modules/issues/detail.coffee                 | 4 ++++
 app/coffee/modules/issues/list.coffee                   | 4 ++++
 app/coffee/modules/kanban/main.coffee                   | 4 ++++
 app/coffee/modules/projects/main.coffee                 | 8 ++++++--
 app/coffee/modules/search.coffee                        | 4 ++++
 app/coffee/modules/taskboard/main.coffee                | 7 ++++++-
 app/coffee/modules/tasks/detail.coffee                  | 4 ++++
 app/coffee/modules/user-settings/change-password.coffee | 4 ++++
 app/coffee/modules/user-settings/main.coffee            | 4 ++++
 app/coffee/modules/user-settings/notifications.coffee   | 4 ++++
 app/coffee/modules/userstories/detail.coffee            | 4 ++++
 app/coffee/modules/wiki/main.coffee                     | 6 +++++-
 17 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 1d39f477..ff685a70 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -80,6 +80,10 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadMembers())
diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee
index c1721bcd..6e95d09b 100644
--- a/app/coffee/modules/admin/project-profile.coffee
+++ b/app/coffee/modules/admin/project-profile.coffee
@@ -76,6 +76,10 @@ class ProjectProfileController extends mixOf(taiga.Controller, taiga.PageMixin)
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
 
     openDeleteLightbox: ->
diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee
index a99434e0..9c6e9366 100644
--- a/app/coffee/modules/admin/project-values.coffee
+++ b/app/coffee/modules/admin/project-values.coffee
@@ -76,6 +76,10 @@ class ProjectValuesController extends mixOf(taiga.Controller, taiga.PageMixin)
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then( => @q.all([
             @.loadProject(),
             @.loadValues(),
diff --git a/app/coffee/modules/admin/roles.coffee b/app/coffee/modules/admin/roles.coffee
index 8afcd917..0ba22f3f 100644
--- a/app/coffee/modules/admin/roles.coffee
+++ b/app/coffee/modules/admin/roles.coffee
@@ -75,6 +75,10 @@ class RolesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fil
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadRoles())
diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 8b0dfc30..089ec8b1 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -168,6 +168,10 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadBacklog())
diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee
index 37fb84e4..c6c1ceb6 100644
--- a/app/coffee/modules/issues/detail.coffee
+++ b/app/coffee/modules/issues/detail.coffee
@@ -124,6 +124,10 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             @scope.issueId = data.issue
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadIssue())
diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee
index 50cc6988..831e2bb3 100644
--- a/app/coffee/modules/issues/list.coffee
+++ b/app/coffee/modules/issues/list.coffee
@@ -261,6 +261,10 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadFilters())
diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee
index 3969bbb2..11173458 100644
--- a/app/coffee/modules/kanban/main.coffee
+++ b/app/coffee/modules/kanban/main.coffee
@@ -146,6 +146,10 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadKanban())
diff --git a/app/coffee/modules/projects/main.coffee b/app/coffee/modules/projects/main.coffee
index 6ded8974..b7e4b9a8 100644
--- a/app/coffee/modules/projects/main.coffee
+++ b/app/coffee/modules/projects/main.coffee
@@ -30,9 +30,9 @@ class ProjectsController extends taiga.Controller
 module.controller("ProjectsController", ProjectsController)
 
 class ProjectController extends taiga.Controller
-    @.$inject = ["$scope", "$tgResources", "$tgRepo", "$routeParams", "$q", "$rootScope", "$appTitle"]
+    @.$inject = ["$scope", "$tgResources", "$tgRepo", "$routeParams", "$q", "$rootScope", "$appTitle", "$tgLocation"]
 
-    constructor: (@scope, @rs, @repo, @params, @q, @rootscope, @appTitle) ->
+    constructor: (@scope, @rs, @repo, @params, @q, @rootscope, @appTitle, @location) ->
         @.loadInitialData()
             .then () =>
                 @appTitle.set(@scope.project.name)
@@ -43,6 +43,10 @@ class ProjectController extends taiga.Controller
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise
                 .then(=> @.loadPageData())
                 .then(=> @scope.$emit("project:loaded", @scope.project))
diff --git a/app/coffee/modules/search.coffee b/app/coffee/modules/search.coffee
index bd1284e0..ed9a0d12 100644
--- a/app/coffee/modules/search.coffee
+++ b/app/coffee/modules/search.coffee
@@ -96,6 +96,10 @@ class SearchController extends mixOf(taiga.Controller, taiga.PageMixin)
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
 
diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee
index 0a834479..7c73c0e7 100644
--- a/app/coffee/modules/taskboard/main.coffee
+++ b/app/coffee/modules/taskboard/main.coffee
@@ -43,9 +43,10 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin)
         "$routeParams",
         "$q",
         "$appTitle"
+        "$tgLocation"
     ]
 
-    constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @appTitle) ->
+    constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @appTitle, @location) ->
         _.bindAll(@)
 
         @scope.sprintId = @params.id
@@ -142,6 +143,10 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin)
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadTaskboard())
diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee
index 1757ee0f..dec30db8 100644
--- a/app/coffee/modules/tasks/detail.coffee
+++ b/app/coffee/modules/tasks/detail.coffee
@@ -118,6 +118,10 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig
             @scope.taskId = data.task
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadTask())
diff --git a/app/coffee/modules/user-settings/change-password.coffee b/app/coffee/modules/user-settings/change-password.coffee
index 2cbe626f..4e1ab20e 100644
--- a/app/coffee/modules/user-settings/change-password.coffee
+++ b/app/coffee/modules/user-settings/change-password.coffee
@@ -63,6 +63,10 @@ class UserChangePasswordController extends mixOf(taiga.Controller, taiga.PageMix
               @scope.projectId = data.project
               return data
 
+          promise.then null, =>
+              @location.path("/not-found")
+              @location.replace()
+
           return promise.then(=> @.loadProject())
 
       save: ->
diff --git a/app/coffee/modules/user-settings/main.coffee b/app/coffee/modules/user-settings/main.coffee
index c48c44c6..a83ebfde 100644
--- a/app/coffee/modules/user-settings/main.coffee
+++ b/app/coffee/modules/user-settings/main.coffee
@@ -61,6 +61,10 @@ class UserSettingsController extends mixOf(taiga.Controller, taiga.PageMixin)
               @scope.projectId = data.project
               return data
 
+          promise.then null, =>
+              @location.path("/not-found")
+              @location.replace()
+
           return promise.then(=> @.loadProject())
 
       saveUserProfile: ->
diff --git a/app/coffee/modules/user-settings/notifications.coffee b/app/coffee/modules/user-settings/notifications.coffee
index 38eb51bc..0052a3bd 100644
--- a/app/coffee/modules/user-settings/notifications.coffee
+++ b/app/coffee/modules/user-settings/notifications.coffee
@@ -68,6 +68,10 @@ class UserNotificationsController extends mixOf(taiga.Controller, taiga.PageMixi
               @scope.projectId = data.project
               return data
 
+          promise.then null, =>
+              @location.path("/not-found")
+              @location.replace()
+
           return promise.then(=> @.loadProject())
                         .then(=> @.loadNotifyPolicies())
 
diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee
index 678a0dea..1d4f97bb 100644
--- a/app/coffee/modules/userstories/detail.coffee
+++ b/app/coffee/modules/userstories/detail.coffee
@@ -129,6 +129,10 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin,
             @scope.usId = data.us
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadUs())
diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee
index d06002fe..19edca2e 100644
--- a/app/coffee/modules/wiki/main.coffee
+++ b/app/coffee/modules/wiki/main.coffee
@@ -80,7 +80,7 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig
             @scope.projectId = data.project
             return data
 
-          promise.then null, =>
+        promise.then null, =>
             @location.path("/project/#{@params.pslug}/wiki/#{@params.slug}/edit")
 
     loadWiki: ->
@@ -102,6 +102,10 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig
             @scope.projectId = data.project
             return data
 
+        promise.then null, =>
+            @location.path("/not-found")
+            @location.replace()
+
         return promise.then(=> @.loadProject())
                       .then(=> @.loadUsersAndRoles())
                       .then(=> @.loadWikiLinks())