Change order of release notes - Confluence before Github

dan-ziv · Nov 6, 2016 · e6e4319 · e6e4319
1 parent 48f804e
commit e6e4319
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/controllers/editTickets.controller.js b/controllers/editTickets.controller.js
@@ -48,6 +48,6 @@ app.controller('editTicketsController', ['$scope', '$location', '$timeout', 'Git
         };
 
         $scope.back = function () {
-            $location.path('/release-notes-confluence');
+            $location.path('/release-notes-github');
         };
     }]);
diff --git a/controllers/popup.controller.js b/controllers/popup.controller.js
@@ -24,11 +24,11 @@ var app = angular.module('releaseVersion', ['ngMaterial', 'ngRoute', 'ig.linkHea
                     controller: 'tagRepoController'
                 })
                 .when('/release-notes-github', {
-                    templateUrl: '3-release-notes-github.html',
+                    templateUrl: '4-release-notes-github.html',
                     controller: 'releaseNotesGitHubController',
                 })
                 .when('/release-notes-confluence', {
-                    templateUrl: '4-release-notes-confluence.html',
+                    templateUrl: '3-release-notes-confluence.html',
                     controller: 'releaseNotesConfluenceController',
                 })
                 .when('/edit-tickets', {

diff --git a/controllers/releaseNotesConfluence.controller.js b/controllers/releaseNotesConfluence.controller.js
@@ -59,10 +59,10 @@ app.controller('releaseNotesConfluenceController', ['$scope', '$location', '$tim
         };
 
         $scope.skip = function () {
-            $location.path('/edit-tickets');
+            $location.path('/release-notes-github');
         };
 
         $scope.back = function () {
-            $location.path('/release-notes-github');
+            $location.path('/tag-repo');
         };
     }]);
diff --git a/controllers/releaseNotesGithub.controller.js b/controllers/releaseNotesGithub.controller.js
@@ -43,10 +43,10 @@ app.controller('releaseNotesGitHubController', ['$scope', '$location', '$timeout
         };
 
         $scope.skip = function () {
-            $location.path('/release-notes-confluence');
+            $location.path('/edit-tickets');
         };
 
         $scope.back = function () {
-            $location.path('/tag-repo');
+            $location.path('/release-notes-confluence');
         };
     }]);
diff --git a/controllers/tagRepo.controller.js b/controllers/tagRepo.controller.js
@@ -29,7 +29,7 @@ app.controller('tagRepoController', ['$scope', '$location', '$timeout', 'GitHub'
         };
 
         $scope.skip = function () {
-            $location.path('/release-notes-github');
+            $location.path('/release-notes-confluence');
         };
 
         $scope.back = function () {

diff --git a/pages/4-release-notes-confluence.html → pages/3-release-notes-confluence.html b/pages/4-release-notes-confluence.html → pages/3-release-notes-confluence.html
diff --git a/pages/3-release-notes-github.html → pages/4-release-notes-github.html b/pages/3-release-notes-github.html → pages/4-release-notes-github.html