diff --git a/src/app/search/controller/search_controller.js b/src/app/search/controller/search_controller.js index d3b6a37d..81e15f9b 100644 --- a/src/app/search/controller/search_controller.js +++ b/src/app/search/controller/search_controller.js @@ -34,7 +34,7 @@ angular.module('sb.search').controller('SearchController', * @type {string[]} */ $scope.resourceTypes = ['TaskStatus', 'Story', 'Project', 'User', - 'Task', 'ProjectGroup']; + 'Task', 'ProjectGroup', 'Board', 'Worklist']; /** * If a 'q' exists in the state params, go ahead and add it. diff --git a/src/app/search/template/board_search_item.html b/src/app/search/template/board_search_item.html new file mode 100644 index 00000000..d6f5dbe0 --- /dev/null +++ b/src/app/search/template/board_search_item.html @@ -0,0 +1,15 @@ + +

+ + {{board.title}} + +

+ + + {{lane.worklist.items.length}} + {{lane.worklist.title}} +   + + diff --git a/src/app/search/template/criteria_tag_item.html b/src/app/search/template/criteria_tag_item.html index dbc0314a..2e120c51 100644 --- a/src/app/search/template/criteria_tag_item.html +++ b/src/app/search/template/criteria_tag_item.html @@ -78,6 +78,20 @@ × +
+ {{tag.title}} + + × + +
+
+ {{tag.title}} + + × + +
{{tag.type}}: {{tag.value}}
+
+
+
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + +
+ No boards found. +
+ Your search criteria are not valid for this item. +
+ + +
+
+
+
+
+
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + +
+ No worklists found. +
+ Your search criteria are not valid for this item. +
+ + +
+
+
diff --git a/src/app/search/template/typeahead_criteria_item.html b/src/app/search/template/typeahead_criteria_item.html index 6075e13f..0c014c6e 100644 --- a/src/app/search/template/typeahead_criteria_item.html +++ b/src/app/search/template/typeahead_criteria_item.html @@ -36,6 +36,12 @@  {{match.model.title}} + +  {{match.model.title}} + + +  {{match.model.title}} +  {{match.model.type}} diff --git a/src/app/search/template/worklist_search_item.html b/src/app/search/template/worklist_search_item.html new file mode 100644 index 00000000..24f98f68 --- /dev/null +++ b/src/app/search/template/worklist_search_item.html @@ -0,0 +1,18 @@ + + + +

+ + {{worklist.title}} + +

+ + + {{worklist.items.length}} + Items + + diff --git a/src/app/services/resource/board.js b/src/app/services/resource/board.js index e2e3fa17..5ff6ca9a 100644 --- a/src/app/services/resource/board.js +++ b/src/app/services/resource/board.js @@ -57,7 +57,8 @@ angular.module('sb.services').factory('Board', 'title', { Text: 'title', - Project: 'project_id', + Story: 'story_id', + Task: 'task_id', User: 'creator_id' } ); diff --git a/src/app/services/resource/worklist.js b/src/app/services/resource/worklist.js index 5040aba5..66711646 100644 --- a/src/app/services/resource/worklist.js +++ b/src/app/services/resource/worklist.js @@ -109,7 +109,8 @@ angular.module('sb.services').factory('Worklist', 'title', { Text: 'title', - Project: 'project_id', + Story: 'story_id', + Task: 'task_id', User: 'creator_id' } );