Merge pull request #41 from lyft/HOTFIX-fix-history-workflow

Split ids/revisions properly
lyft · Apr 6, 2015 · 5e873de · 5e873de
2 parents ab22410 + 8a8d875
commit 5e873de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/confidant/public/modules/history/controllers/CredentialHistoryCtrl.js b/confidant/public/modules/history/controllers/CredentialHistoryCtrl.js
@@ -31,8 +31,8 @@
             $scope.revisions = [];
 
             var idArr = $stateParams.credentialId.split('-');
-            $scope.credentialId = idArr[0];
-            $scope.credentialRevision = parseInt(idArr[1], 10);
+            $scope.credentialRevision = parseInt(idArr.pop(), 10);
+            $scope.credentialId = idArr.join('-');
             CredentialArchiveRevisions.get({'id': $scope.credentialId}).$promise.then(function(revisions) {
                 $scope.revisions = $filter('orderBy')(revisions.revisions, 'revision', true);
                 $scope.currentRevision = parseInt($scope.revisions[0].revision, 10);

diff --git a/confidant/public/modules/history/controllers/ServiceHistoryCtrl.js b/confidant/public/modules/history/controllers/ServiceHistoryCtrl.js
@@ -25,8 +25,8 @@
             $scope.revisions = [];
 
             var idArr = $stateParams.serviceId.split('-');
-            $scope.serviceId = idArr[0];
-            $scope.serviceRevision = parseInt(idArr[1], 10);
+            $scope.serviceRevision = parseInt(idArr.pop(), 10);
+            $scope.serviceId = idArr.join('-');
             ServiceArchiveRevisions.get({'id': $scope.serviceId}).$promise.then(function(revisions) {
                 $scope.revisions = $filter('orderBy')(revisions.revisions, 'revision', true);
                 $scope.currentRevision = parseInt($scope.revisions[0].revision, 10);

diff --git a/confidant/public/modules/history/services/archive.js b/confidant/public/modules/history/services/archive.js
@@ -33,7 +33,9 @@
                     }
                     for (i = serviceArchive.length; i--;) {
                         serviceArchive[i].type = 'service';
-                        serviceArchive[i].name = serviceArchive[i].id.split('-')[0];
+                        var nameArr = serviceArchive[i].id.split('-');
+                        nameArr.pop();
+                        serviceArchive[i].name = nameArr.join('-');
                     }
                     _this.resourceArchive = credentialArchive.concat(serviceArchive);
                 }, function() {