diff --git a/AUTHORS.rst b/AUTHORS.rst index 31e3c168..6b5963bf 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -21,6 +21,7 @@ answer newbie questions, and generally made Taiga that much better: - Brett Profitt - Chris Wilson - Daniel Koch +- Everardo Medina - Florian Bezagu - Guilhem Got - Jordan Rinke diff --git a/CHANGELOG.md b/CHANGELOG.md index 2af211e8..57d95cd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ... ### 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. diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index dd95fec7..3722b936 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -140,7 +140,8 @@ "BLOCKED_NOTE": "blocked note", "IS_BLOCKED": "is blocked", "REF": "Ref", - "VOTES": "Votes" + "VOTES": "Votes", + "SPRINT": "Sprint" }, "ROLES": { "ALL": "All" diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json index 3c24f1c6..2e2d9abc 100644 --- a/app/locales/taiga/locale-es.json +++ b/app/locales/taiga/locale-es.json @@ -1572,4 +1572,4 @@ "RESULTS": "Resultados de búsqueda" } } -} \ No newline at end of file +} diff --git a/app/partials/includes/modules/search-result-table.jade b/app/partials/includes/modules/search-result-table.jade index 2394f9da..f6550aa5 100644 --- a/app/partials/includes/modules/search-result-table.jade +++ b/app/partials/includes/modules/search-result-table.jade @@ -28,6 +28,7 @@ script(type="text/ng-template", id="search-userstories") div.row.title div.ref(translate="COMMON.FIELDS.REF") div.user-stories(translate="SEARCH.FILTER_USER_STORIES") + div.sprint(translate="COMMON.FIELDS.SPRINT") div.status(translate="COMMON.FIELDS.STATUS") div.points(translate="COMMON.FIELDS.POINTS") div.search-result-table-body @@ -37,6 +38,10 @@ script(type="text/ng-template", id="search-userstories") div.user-story-name a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", 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.points(tg-bo-bind="us.total_points") diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss index e970dfdf..2f4607bc 100644 --- a/app/styles/modules/search/search-result-table.scss +++ b/app/styles/modules/search/search-result-table.scss @@ -17,7 +17,8 @@ flex-shrink: 1; } .status, - .points { + .points, + .sprint { flex-basis: 150px; flex-grow: 0; padding: 0 1rem; @@ -60,7 +61,8 @@ border-bottom: 1px solid $whitish; } .status, - .points { + .points, + .sprint { position: relative; } .avatar {