diff --git a/AUTHORS.rst b/AUTHORS.rst index c1066e92..8f30a52f 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -26,3 +26,4 @@ answer newbie questions, and generally made Taiga that much better: - Daniel Koch - Florian Bezagu - Ryan Swanstrom +- Chris Wilson diff --git a/CHANGELOG.md b/CHANGELOG.md index a5cb39ed..3264fc46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ## 1.8.0 ??? (unreleased) ### Features -- ... +- Show the reference of entities in search results (thanks to [@artlepool](https://github.com/artlepool)) ### Misc - Lots of small and not so small bugfixes. diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 1b1f3779..0a91ff9c 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -125,7 +125,8 @@ "ASSIGNED_TO": "Assigned to", "POINTS": "Points", "BLOCKED_NOTE": "blocked note", - "IS_BLOCKED": "is blocked" + "IS_BLOCKED": "is blocked", + "REF": "Ref" }, "ROLES": { "ALL": "All" diff --git a/app/partials/includes/modules/search-result-table.jade b/app/partials/includes/modules/search-result-table.jade index aaebd465..be95d40c 100644 --- a/app/partials/includes/modules/search-result-table.jade +++ b/app/partials/includes/modules/search-result-table.jade @@ -4,11 +4,13 @@ script(type="text/ng-template", id="search-issues") div.search-result-table-container(ng-class="{'hidden': !issues.length}", tg-bind-scope) div.search-result-table-header div.row.title + div.ref(translate="COMMON.FIELDS.REF") div.user-stories(translate="SEARCH.FILTER_ISSUES") div.status(translate="COMMON.FIELDS.STATUS") div.assigned-to(translate="COMMON.FIELDS.ASSIGNED_TO") div.search-result-table-body div.row.table-main(ng-repeat="issue in issues track by issue.id") + div.ref(tg-bo-ref="issue.ref") div.user-stories div.user-story-name a(href="", tg-nav="project-issues-detail:project=project.slug,ref=issue.ref", @@ -26,11 +28,13 @@ script(type="text/ng-template", id="search-userstories") div.search-result-table-container(ng-class="{'hidden': !userstories.length}", tg-bind-scope) div.search-result-table-header div.row.title + div.ref(translate="COMMON.FIELDS.REF") div.user-stories(translate="SEARCH.FILTER_USER_STORIES") div.status(translate="COMMON.FIELDS.STATUS") div.points(translate="COMMON.FIELDS.POINTS") div.search-result-table-body div.row.table-main(ng-repeat="us in userstories track by us.id") + div.ref(tg-bo-ref="us.ref") div.user-stories div.user-story-name a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", @@ -47,11 +51,13 @@ script(type="text/ng-template", id="search-tasks") div.search-result-table-container(ng-class="{'hidden': !tasks.length}", tg-bind-scope) div.search-result-table-header div.row.title + div.ref(translate="COMMON.FIELDS.REF") div.user-stories(translate="SEARCH.FILTER_TASKS") div.status(translate="COMMON.FIELDS.STATUS") div.assigned-to(translate="COMMON.FIELDS.ASSIGNED_TO") div.search-result-table-body div.row.table-main(ng-repeat="task in tasks track by task.id") + div.ref(tg-bo-ref="task.ref") div.user-stories div.user-story-name a(href="", tg-nav="project-tasks-detail:project=project.slug,ref=task.ref", diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss index ed37282e..ebbf8884 100644 --- a/app/styles/modules/search/search-result-table.scss +++ b/app/styles/modules/search/search-result-table.scss @@ -16,6 +16,11 @@ background: lighten($green-taiga, 60%); transition: background .2s ease-in; } + .ref { + flex-basis: 30px; + flex-grow: 1; + padding: 0 1rem; + } .user-stories { flex-basis: 300px; flex-grow: 10;