From 0e35acf9ff5618c9ca9e28cd3ccf4e026d1629e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Mon, 20 Aug 2018 12:55:48 +0200 Subject: [PATCH 1/4] Cancel with confirmation in wysiwyg editor --- .../components/detail/header/detail-header.controller.coffee | 4 ++++ app/modules/components/detail/header/detail-header.jade | 2 +- app/modules/components/wysiwyg/wysiwyg.directive.coffee | 4 ++-- app/partials/common/components/wysiwyg-toolbar.jade | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/modules/components/detail/header/detail-header.controller.coffee b/app/modules/components/detail/header/detail-header.controller.coffee index 11ab7f68..0e88be37 100644 --- a/app/modules/components/detail/header/detail-header.controller.coffee +++ b/app/modules/components/detail/header/detail-header.controller.coffee @@ -58,6 +58,10 @@ class StoryHeaderController canEdit: _.includes(@.project.my_permissions, @.requiredPerm) } + cancelEdit: () -> + @.editMode = false + @.item.subject = @.originalSubject + editSubject: (value) -> selection = @window.getSelection() if selection.type != "Range" diff --git a/app/modules/components/detail/header/detail-header.jade b/app/modules/components/detail/header/detail-header.jade index 40f710cd..2b0d3843 100644 --- a/app/modules/components/detail/header/detail-header.jade +++ b/app/modules/components/detail/header/detail-header.jade @@ -42,7 +42,7 @@ svg-icon="icon-save" ) button.edit-title-button.cancel-title-button.e2e-cancel-title-button( - ng-click="vm.editSubject(false)" + ng-click="vm.cancelEdit(false)" ) tg-svg(svg-icon="icon-close") diff --git a/app/modules/components/wysiwyg/wysiwyg.directive.coffee b/app/modules/components/wysiwyg/wysiwyg.directive.coffee index 4685a954..de8a7f30 100644 --- a/app/modules/components/wysiwyg/wysiwyg.directive.coffee +++ b/app/modules/components/wysiwyg/wysiwyg.directive.coffee @@ -352,7 +352,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad discardLocalStorage = () -> $storage.remove($scope.storageKey) - cancelWithConfirmation = () -> + $scope.cancelWithConfirmation = () -> if $scope.content == $scope.markdown $scope.cancel() @@ -509,7 +509,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad if $scope.editMode && code == 27 e.stopPropagation() - $scope.$applyAsync(cancelWithConfirmation) + $scope.$applyAsync($scope.cancelWithConfirmation) else if code == 27 editorMedium.blur() diff --git a/app/partials/common/components/wysiwyg-toolbar.jade b/app/partials/common/components/wysiwyg-toolbar.jade index 035267a8..b5ee3cc6 100644 --- a/app/partials/common/components/wysiwyg-toolbar.jade +++ b/app/partials/common/components/wysiwyg-toolbar.jade @@ -44,7 +44,7 @@ tg-svg(svg-icon="icon-save") a.e2e-cancel-editor( href="#", - ng-click="cancel($event)" + ng-click="cancelWithConfirmation($event)" title="{{ 'COMMON.CANCEL' | translate }}" ) tg-svg(svg-icon="icon-close") From d1acbb4a1b052fec1ae315866cf434becf50f58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Mon, 20 Aug 2018 13:05:08 +0200 Subject: [PATCH 2/4] Fixed confirmation message shown when removing a us relationship with an epic --- app/locales/taiga/locale-en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index b254df6a..2f2b9a65 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -1105,7 +1105,7 @@ }, "REMOVE_RELATIONSHIP_WITH_EPIC": { "TITLE": "Remove relationship with Epic", - "MESSAGE": "Are you sure you want to delete the relationship of this User Story with the Epic {{epicSubject}}?" + "MESSAGE": "Are you sure you want to remove the relationship of this User Story with the Epic {{epicSubject}}?" }, "CREATE_MEMBER": { "PLACEHOLDER_INVITATION_TEXT": "(Optional) Add a personalized text to the invitation. Tell something lovely to your new members ;-)", From b9bc448652cc38ca658d923ec05aa2445ac9125c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Mon, 20 Aug 2018 17:38:25 +0200 Subject: [PATCH 3/4] Update messages catalog --- app/locales/taiga/locale-de.json | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json index a716b29a..516908f7 100644 --- a/app/locales/taiga/locale-de.json +++ b/app/locales/taiga/locale-de.json @@ -615,13 +615,13 @@ "SELECTED": "Ausgewählt" }, "PROJECT_DUE_DATE_STATUS": { - "TITLE": "Due Dates", + "TITLE": "Fällikeitstermine", "SUBTITLE": "Specify the due dates your user stories, tasks and issues will go through if selected", "US_TITLE": "User Story Due Date status", "ACTION_ADD_STATUS": "Neuen Status hinzufügen", "TASK_TITLE": "Task Due Date status", - "ISSUE_TITLE": "Issue Due Date status", - "DAYS_TO_DUE_DATE": "Days to due date", + "ISSUE_TITLE": "Status der Ticket Fälligkeit", + "DAYS_TO_DUE_DATE": "Tage bis zur Fällikeit", "BEFORE_AFTER": "Before/after", "BEFORE": "Before", "AFTER": "Past" @@ -727,7 +727,7 @@ }, "STATUS": { "PLACEHOLDER_WRITE_STATUS_NAME": "Benennen Sie den neuen Status", - "PLACEHOLDER_DAYS_TO_DUE_DATE": "Write a number of days to due date" + "PLACEHOLDER_DAYS_TO_DUE_DATE": "Zahl der Tage bis zur Fälligkeit" }, "TYPES": { "PLACEHOLDER_WRITE_NAME": "Geben Sie dem neuen Element einen Namen" @@ -754,7 +754,7 @@ "TYPES": "Typen", "CUSTOM_FIELDS": "Benutzerdefinierte Felder", "TAGS": "Schlagwörter", - "DUE_DATES": "Due dates" + "DUE_DATES": "Fälligkeiten" }, "SUBMENU_ROLES": { "TITLE": "Rollen", @@ -1087,12 +1087,12 @@ }, "CREATE_EDIT": { "PLACEHOLDER_DESCRIPTION": "Please add descriptive text to help others better understand this {{ objName }}", - "NEW": "New {{ objName }}", - "EDIT": "Edit {{ objName }}", - "ADD_EXISTING": "Add {{ objName }} to {{ targetName }}", + "NEW": "Neu {{ objName }}", + "EDIT": "Bearbeiten {{ objName }}", + "ADD_EXISTING": "{{ objName }} zu {{ targetName }} hinzufügen", "CONFIRM_CLOSE": "Sie haben Ihre Änderungen noch nicht gespeichert.\nSind Sie sicher, dass Sie dieses Formular schließen möchten?", - "EXISTING_OBJECT": "Existing {{ objName }}", - "NEW_OBJECT": "New {{ objName }}", + "EXISTING_OBJECT": "{{ objName }} existiert", + "NEW_OBJECT": "Neu {{ objName }}", "CHOOSE_EXISTING": "Which {{ objName }}?" }, "DELETE_DUE_DATE": { @@ -1103,7 +1103,7 @@ "TITLE": "Sprint löschen" }, "REMOVE_RELATIONSHIP_WITH_EPIC": { - "TITLE": "Remove relationship with Epic", + "TITLE": "Verbindung zum Epic entfernen", "MESSAGE": "Are you sure you want to delete the relationship of this User Story with the Epic {{epicSubject}}" }, "CREATE_MEMBER": { @@ -1154,12 +1154,12 @@ "RELATE_TO_EPIC": { "TITLE": "Link to Epic", "EXISTING_EPIC": "Existing epic", - "NEW_EPIC": "New epic", + "NEW_EPIC": "Neues Epic", "CHOOSE_PROJECT_FOR_CREATION": "Welches Projekt?", "CHOOSE_PROJECT_FROM": "Welches Projekt?", "SUBJECT": "Thema", - "CHOOSE_EPIC": "What's the epic?", - "FILTER_EPICS": "Filter epics", + "CHOOSE_EPIC": "Beschreibe das Epic", + "FILTER_EPICS": "Epics Filtern", "NO_EPICS_FOUND": "Es sieht so aus, als konnte zu Ihren Suchkriterien nichts passendes gefunden werden." } }, @@ -1173,11 +1173,11 @@ "CREATE_RELATED_USERSTORIES": "Erstelle eine Verbindung mit", "NEW_USERSTORY": "Neue User-Story", "EXISTING_USERSTORY": "Bestehende User-Story", - "CHOOSE_PROJECT_FOR_CREATION": "Which project?", + "CHOOSE_PROJECT_FOR_CREATION": "Welches Projekt?", "SUBJECT": "Thema", "SUBJECT_BULK_MODE": "Thema (Mehrfacheingaben möglich)", - "CHOOSE_PROJECT_FROM": "Which project?", - "CHOOSE_USERSTORY": "Which user story?", + "CHOOSE_PROJECT_FROM": "Welches Projekt?", + "CHOOSE_USERSTORY": "Beschreibung der User Story", "NO_USERSTORIES": "Dieses Projekt hat zurzeit keine User Stories. Bitte wähle ein anderes Projekt.", "NO_USERSTORIES_FOUND": "Es sieht so aus, als konnte zu Ihren Suchkriterien nichts passendes gefunden werden.", "FILTER_USERSTORIES": "User-Stories filter", @@ -1359,8 +1359,8 @@ "SECTION_NAME": "Taskboard", "TITLE_ACTION_ADD": "Neue Aufgabe hinzufügen", "TITLE_ACTION_ADD_BULK": "Mehrere Aufgaben hinzufügen", - "TITLE_ACTION_ADD_ISSUE": "Add a new Issue", - "TITLE_ACTION_ADD_ISSUE_BULK": "Add some new Issues in bulk", + "TITLE_ACTION_ADD_ISSUE": "Ein neues Ticket hinzufügen", + "TITLE_ACTION_ADD_ISSUE_BULK": "Stapel von neuen Tickets anlegen", "TITLE_ACTION_ASSIGN": "Aufgabe zuweisen", "PLACEHOLDER_CARD_TITLE": "Das könnte ein Task sein", "PLACEHOLDER_CARD_TEXT": "Teile Stories in Tasks auf um sie einzeln zu verfolgen", @@ -1446,7 +1446,7 @@ "SEVERITY": "Gewichtung", "TYPE": "Arten" }, - "FILTER_ISSUES": "Filter Issues", + "FILTER_ISSUES": "Tickets Filtern", "CONFIRM_DETACH_FROM_SPRINT": { "TITLE": "Detach issue from Sprint", "MESSAGE": "You are about to detach the issue from the sprint" From 583cb5b5d1e9fd006d31a9609d8a30936c8f1acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Mon, 20 Aug 2018 17:51:18 +0200 Subject: [PATCH 4/4] Updated change log --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 462e79de..66c8a20f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## Unreleased +## 3.4.1 (2018-08-21) + +### Misc + +- Add auto CTRL+C in admin icon for reports URL's. +- Minor bug fixes. + ## 3.4.0 Pinus contorta (2018-08-13) ### Features