taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #968 from taigaio/us/3903/show-sprint-in-search-results 

US #3903: Sprint number/title column on search results for user stories
stable
David Barragán Merino 2016-04-19 16:53:35 +02:00
parent ce7a042382 3eea466451
commit 6ed24cb46e
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.rst
View File

@ -21,6 +21,7 @@ answer newbie questions, and generally made Taiga that much better:
- Brett Profitt <brett.profitt@gmail.com> - Brett Profitt <brett.profitt@gmail.com>
- Chris Wilson <chris.wilson@aridhia.com> - Chris Wilson <chris.wilson@aridhia.com>
- Daniel Koch - Daniel Koch
- Everardo Medina <everblut@gmail.com>
- Florian Bezagu - Florian Bezagu
- Guilhem Got <guilhem.got@gmail.com> - Guilhem Got <guilhem.got@gmail.com>
- Jordan Rinke - Jordan Rinke

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
- ... - ...
### Misc ### Misc
- Add sprint title on search results for user stories (thanks to [@everblut](https://github.com/everblut))
- Lots of small and not so small bugfixes. - Lots of small and not so small bugfixes.

3
app/locales/taiga/locale-en.json
View File

@ -140,7 +140,8 @@
"BLOCKED_NOTE": "blocked note", "BLOCKED_NOTE": "blocked note",
"IS_BLOCKED": "is blocked", "IS_BLOCKED": "is blocked",
"REF": "Ref", "REF": "Ref",
"VOTES": "Votes" "VOTES": "Votes",
"SPRINT": "Sprint"
}, },
"ROLES": { "ROLES": {
"ALL": "All" "ALL": "All"

2
app/locales/taiga/locale-es.json
View File

@ -1572,4 +1572,4 @@
"RESULTS": "Resultados de búsqueda" "RESULTS": "Resultados de búsqueda"
} }
} }
} }

5
app/partials/includes/modules/search-result-table.jade
View File

@ -28,6 +28,7 @@ script(type="text/ng-template", id="search-userstories")
div.row.title div.row.title
div.ref(translate="COMMON.FIELDS.REF") div.ref(translate="COMMON.FIELDS.REF")
div.user-stories(translate="SEARCH.FILTER_USER_STORIES") div.user-stories(translate="SEARCH.FILTER_USER_STORIES")
div.sprint(translate="COMMON.FIELDS.SPRINT")
div.status(translate="COMMON.FIELDS.STATUS") div.status(translate="COMMON.FIELDS.STATUS")
div.points(translate="COMMON.FIELDS.POINTS") div.points(translate="COMMON.FIELDS.POINTS")
div.search-result-table-body div.search-result-table-body
@ -37,6 +38,10 @@ script(type="text/ng-template", id="search-userstories")
div.user-story-name div.user-story-name
a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
tg-bo-bind="us.subject") tg-bo-bind="us.subject")
div.sprint
div.sprint-link
a(href="", tg-nav="project-taskboard:project=project.slug,sprint=us.milestone_slug",
tg-bo-bind="us.milestone_name")
div.status(tg-listitem-us-status="us") div.status(tg-listitem-us-status="us")
div.points(tg-bo-bind="us.total_points") div.points(tg-bo-bind="us.total_points")

6
app/styles/modules/search/search-result-table.scss
View File

@ -17,7 +17,8 @@
flex-shrink: 1; flex-shrink: 1;
} }
.status, .status,
.points { .points,
.sprint {
flex-basis: 150px; flex-basis: 150px;
flex-grow: 0; flex-grow: 0;
padding: 0 1rem; padding: 0 1rem;
@ -60,7 +61,8 @@
border-bottom: 1px solid $whitish; border-bottom: 1px solid $whitish;
} }
.status, .status,
.points { .points,
.sprint {
position: relative; position: relative;
} }
.avatar { .avatar {