From f594bff094b4e5ff3012b5e280b71ae6a77fdf59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Wed, 22 Aug 2018 11:57:34 +0200 Subject: [PATCH] Change CREATED to MODIFIED in issues' list --- app/coffee/modules/issues/list.coffee | 28 +++++++++++++------ app/locales/taiga/locale-en.json | 2 +- .../includes/modules/issues-table.jade | 10 +++---- app/styles/layout/rtl.scss | 6 ++-- app/styles/modules/issues/issues-table.scss | 4 +-- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index c9063ff6..3f7aade3 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -94,6 +94,23 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi @analytics.trackEvent("issue", "create", "create issue on issues list", 1) @.loadIssues() + @scope.$on "assigned-to:changed", => + @.generateFilters() + if @.isFilterDataTypeSelected('assigned_to') ||\ + @.isFilterDataTypeSelected('role') ||\ + @.isOrderedBy('assigned_to') || @.isOrderedBy('modified') + @.loadIssues() + + @scope.$on "status:changed", => + @.generateFilters() + if @.isFilterDataTypeSelected('status') ||\ + @.isOrderedBy('status') || @.isOrderedBy('modified') + @.loadIssues() + + isOrderedBy: (fieldName) -> + pattern = new RegExp("-*"+fieldName) + return pattern.test(@location.search().order_by) + changeQ: (q) -> @.unselectFilter("page") @.replaceFilter("q", q) @@ -596,10 +613,8 @@ IssueStatusInlineEditionDirective = ($repo, $template, $rootscope) -> updateIssueStatus($el, issue, $scope.issueStatusById) $scope.$apply () -> - $repo.save(issue).then -> - $ctrl.generateFilters() - if $ctrl.isFilterDataTypeSelected('status') - $ctrl.loadIssues() + $repo.save(issue).then (response) -> + $rootscope.$broadcast("status:changed", response) taiga.bindOnce $scope, "project", (project) -> $el.append(selectionTemplate({ 'statuses': project.issue_statuses })) @@ -670,10 +685,7 @@ IssueAssignedToInlineEditionDirective = ($repo, $rootscope, $translate, avatarSe updatedIssue.assigned_to = userId $repo.save(issue).then -> updateIssue(updatedIssue) - $ctrl.generateFilters() - if $ctrl.isFilterDataTypeSelected('assigned_to') \ - || $ctrl.isFilterDataTypeSelected('role') - $ctrl.loadIssues() + $rootscope.$broadcast("assigned-to:changed", updatedIssue) $scope.$watch $attrs.tgIssueAssignedToInlineEdition, (val) -> updateIssue(val) diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index 2f2b9a65..01cc7f17 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -1465,7 +1465,7 @@ "SUBJECT": "Subject", "VOTES": "Votes", "STATUS": "Status", - "CREATED": "Created", + "MODIFIED": "Modified", "ASSIGNED_TO": "Assigned to" }, "TITLE_ACTION_CHANGE_STATUS": "Change status", diff --git a/app/partials/includes/modules/issues-table.jade b/app/partials/includes/modules/issues-table.jade index f9aa3f5d..ce08df06 100644 --- a/app/partials/includes/modules/issues-table.jade +++ b/app/partials/includes/modules/issues-table.jade @@ -12,8 +12,8 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}") | {{"ISSUES.TABLE.COLUMNS.SUBJECT" | translate}} div.issue-field(data-fieldname="status") | {{"ISSUES.TABLE.COLUMNS.STATUS" | translate}} - div.created-field(data-fieldname="created_date") - | {{"ISSUES.TABLE.COLUMNS.CREATED" | translate}} + div.modified-field(data-fieldname="modified_date") + | {{"ISSUES.TABLE.COLUMNS.MODIFIED" | translate}} div.assigned-field(data-fieldname="assigned_to") | {{"ISSUES.TABLE.COLUMNS.ASSIGNED_TO" | translate}} @@ -73,10 +73,10 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}") svg-icon="icon-arrow-down" ) - div.created-field( - tg-bo-bind="issue.created_date|momentFormat:'DD MMM YYYY'" - tg-bo-title="issue.created_date|momentFormat:'DD MMM YYYY HH:mm'" + div.modified-field( + title="{{ issue.modified_date|momentFormat:'DD MMM YYYY HH:mm' }}" ) + {{ issue.modified_date|momentFormat:'DD MMM YYYY'}} div.assigned-field(tg-issue-assigned-to-inline-edition="issue") div.issue-assignedto(title="{{'ISSUES.TABLE.TITLE_ACTION_ASSIGNED_TO' | translate}}") diff --git a/app/styles/layout/rtl.scss b/app/styles/layout/rtl.scss index 33d45c14..0a2a085c 100644 --- a/app/styles/layout/rtl.scss +++ b/app/styles/layout/rtl.scss @@ -172,15 +172,13 @@ margin-right: .2rem; } .issues-table .issue-field, - .issues-table .assigned-field, - .issues-table .created-field, + .issues-table .modified-field, .issues-table .assigned-field { text-align: right; } .issues-table .issue-field .icon, - .issues-table .assigned-field .icon, - .issues-table .created-field .icon, + .issues-table .modified-field .icon, .issues-table .assigned-field .icon { margin-left: 0; margin-right: .25rem; diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss index 1b0ad746..c048f6ee 100644 --- a/app/styles/modules/issues/issues-table.scss +++ b/app/styles/modules/issues/issues-table.scss @@ -122,7 +122,7 @@ } .issue-field, .assigned-field, - .created-field , + .modified-field , .assigned-field { flex-basis: 140px; flex-grow: 1; @@ -173,7 +173,7 @@ } } .level-field, - .created-field { + .modified-field { @include breakpoint(laptop) { display: none; }