opendev
/
storyboard-webclient
Code Issues Proposed changes

Merge "Support Task ID in the "Jump to..." box"

This commit is contained in:
Zuul 2018-09-05 19:52:24 +00:00 committed by Gerrit Code Review
parent e56df6ff6d e88967a2f4
commit 4c066ab5ec
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/storyboard/controller/header_controller.js
View File

@ -22,7 +22,7 @@ angular.module('storyboard').controller('HeaderController',
function ($q, $scope, $rootScope, $state, $modal, NewStoryService,
Session, SessionState, CurrentUser, Criteria, Notification,
Priority, Project, Story, ProjectGroup, NewWorklistService,
NewBoardService, SessionModalService, Severity) {
NewBoardService, SessionModalService, Severity, Task) {
'use strict';
function resolveCurrentUser() {
@ -157,6 +157,9 @@ angular.module('storyboard').controller('HeaderController',
case 'Story':
$state.go('sb.story.detail', {storyId: criteria.value});
break;
case 'Task':
$state.go('sb.task', {taskId: criteria.value});
break;
}
$scope.searchString = '';
@ -190,6 +193,7 @@ angular.module('storyboard').controller('HeaderController',
var getProjectGroupDeferred = $q.defer();
var getProjectDeferred = $q.defer();
var getStoryDeferred = $q.defer();
var getTaskDeferred = $q.defer();
headerGET = true;
ProjectGroup.get({id: searchString},
@ -216,11 +220,20 @@ angular.module('storyboard').controller('HeaderController',
}, function () {
getStoryDeferred.resolve(null);
});
Task.get({id: searchString},
function (result) {
getTaskDeferred.resolve(Criteria.create(
'Task', result.id, result.title
));
}, function () {
getTaskDeferred.resolve(null);
});
// If the search string is entirely numeric, do a GET.
searches.push(getProjectGroupDeferred.promise);
searches.push(getProjectDeferred.promise);
searches.push(getStoryDeferred.promise);
searches.push(getTaskDeferred.promise);
} else {
searches.push(ProjectGroup.criteriaResolver(searchString, 5));