diff options
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | i18n/fi.i18n.json | 4 | ||||
| -rw-r--r-- | i18n/ru.i18n.json | 40 | ||||
| -rw-r--r-- | models/checklistItems.js | 17 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
6 files changed, 49 insertions, 27 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b817a0a..bd80b530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v1.83 2018-12-06 Wekan release + +This release fixes the following bugs: + +- Fix IFTTT Rule action/trigger part 1 of 8: [When a checklist is completed](https://github.com/wekan/wekan/issues/1972). + And partial incomplete fix to when all of checklist is set as uncompleted. Help in fixing welcome. + +Thanks to GitHub users BurakTuran9 and xet7 for their contributions. + # v1.82 2018-12-05 Wekan release This release fixes the following bugs: diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 3c2c16c6..d8671e4a 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -565,8 +565,8 @@ "r-checked": "Ruksattu", "r-unchecked": "Poistettu ruksi", "r-move-card-to": "Siirrä kortti kohteeseen", - "r-top-of": "Päällä kohteen", - "r-bottom-of": "Pohjalla kohteen", + "r-top-of": "Ylimmäiseksi", + "r-bottom-of": "Alimmaiseksi", "r-its-list": "sen lista", "r-archive": "Siirrä Arkistoon", "r-unarchive": "Palauta Arkistosta", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 7b6d63fa..a49ef8f9 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -11,10 +11,10 @@ "act-createCustomField": "создано настраиваемое поле __customField__", "act-createList": "добавил __list__ на __board__", "act-addBoardMember": "добавил __member__ на __board__", - "act-archivedBoard": "__board__ moved to Archive", - "act-archivedCard": "__card__ moved to Archive", - "act-archivedList": "__list__ moved to Archive", - "act-archivedSwimlane": "__swimlane__ moved to Archive", + "act-archivedBoard": "Доска __board__ перемещена в архив", + "act-archivedCard": "Карточка __card__ перемещена в архив", + "act-archivedList": "Список __list__ перемещён в архив", + "act-archivedSwimlane": "Дорожка __swimlane__ перемещена в архив", "act-importBoard": "__board__ импортирована", "act-importCard": "__card__ импортирована", "act-importList": "__list__ импортирован", @@ -79,18 +79,18 @@ "and-n-other-card_plural": "И __count__ другие карточки", "apply": "Применить", "app-is-offline": "Wekan загружается, пожалуйста подождите. Обновление страницы может привести к потере данных. Если Wekan не загрузился, пожалуйста проверьте что связь с сервером доступна.", - "archive": "Move to Archive", - "archive-all": "Move All to Archive", - "archive-board": "Move Board to Archive", - "archive-card": "Move Card to Archive", - "archive-list": "Move List to Archive", - "archive-swimlane": "Move Swimlane to Archive", - "archive-selection": "Move selection to Archive", - "archiveBoardPopup-title": "Move Board to Archive?", + "archive": "Переместить в архив", + "archive-all": "Переместить всё в архив", + "archive-board": "Переместить доску в архив", + "archive-card": "Переместить карточку в архив", + "archive-list": "Переместить список в архив", + "archive-swimlane": "Переместить дорожку в архив", + "archive-selection": "Переместить выбранное в архив", + "archiveBoardPopup-title": "Переместить доску в архив?", "archived-items": "Архивировать", - "archived-boards": "Boards in Archive", + "archived-boards": "Доски в архиве", "restore-board": "Востановить доску", - "no-archived-boards": "No Boards in Archive.", + "no-archived-boards": "Нет досок в архиве.", "archives": "Архивировать", "assign-member": "Назначить участника", "attached": "прикреплено", @@ -118,12 +118,12 @@ "board-view-lists": "Списки", "bucket-example": "Например “Список дел”", "cancel": "Отмена", - "card-archived": "This card is moved to Archive.", - "board-archived": "This board is moved to Archive.", + "card-archived": "Эта карточка перемещена в архив", + "board-archived": "Эта доска перемещена в архив.", "card-comments-title": "Комментарии (%s)", "card-delete-notice": "Это действие невозможно будет отменить. Все изменения, которые вы вносили в карточку будут потеряны.", "card-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете заново открыть карточку. Действие необратимо", - "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.", + "card-delete-suggest-archive": "Вы можете переместить карточку в архив, чтобы убрать ее с доски, сохранив всю историю действий участников.", "card-due": "Выполнить к", "card-due-on": "Выполнить до", "card-spent": "Затраченное время", @@ -146,7 +146,7 @@ "cards": "Карточки", "cards-count": "Карточки", "casSignIn": "Sign In with CAS", - "cardType-card": "Card", + "cardType-card": "Карточка", "cardType-linkedCard": "Linked Card", "cardType-linkedBoard": "Linked Board", "change": "Изменить", @@ -568,7 +568,7 @@ "r-top-of": "Top of", "r-bottom-of": "Bottom of", "r-its-list": "its list", - "r-archive": "Move to Archive", + "r-archive": "Переместить в архив", "r-unarchive": "Restore from Archive", "r-card": "card", "r-add": "Создать", @@ -618,5 +618,5 @@ "authentication-type": "Authentication type", "custom-product-name": "Custom Product Name", "layout": "Layout", - "hide-logo": "Hide Logo" + "hide-logo": "Скрыть логотип" }
\ No newline at end of file diff --git a/models/checklistItems.js b/models/checklistItems.js index c85c0260..9867dd94 100644 --- a/models/checklistItems.js +++ b/models/checklistItems.js @@ -126,7 +126,7 @@ function publishChekListCompleted(userId, doc){ if(checkList.isFinished()){ const act = { userId, - activityType: 'checklistCompleted', + activityType: 'completeChecklist', cardId: doc.cardId, boardId, checklistId: doc.checklistId, @@ -141,10 +141,23 @@ function publishChekListUncompleted(userId, doc){ const boardId = card.boardId; const checklistId = doc.checklistId; const checkList = Checklists.findOne({_id:checklistId}); + // BUGS in IFTTT Rules: https://github.com/wekan/wekan/issues/1972 + // Currently in checklist all are set as uncompleted/not checked, + // IFTTT Rule does not move card to other list. + // If following line is negated/changed to: + // if(!checkList.isFinished()){ + // then unchecking of any checkbox will move card to other list, + // even when all checkboxes are not yet unchecked. + // What is correct code for only moving when all in list is unchecked? + // TIPS: Finding files, ignoring some directories with grep -v: + // cd wekan + // find . | xargs grep 'count' -sl | grep -v .meteor | grep -v node_modules | grep -v .build + // Maybe something related here? + // wekan/client/components/rules/triggers/checklistTriggers.js if(checkList.isFinished()){ const act = { userId, - activityType: 'checklistUncompleted', + activityType: 'uncompleteChecklist', cardId: doc.cardId, boardId, checklistId: doc.checklistId, diff --git a/package.json b/package.json index 67075b97..07668c18 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.82.0", + "version": "v1.83.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index b5fcd0c3..04c717d7 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 184, + appVersion = 185, # Increment this for every release. - appMarketingVersion = (defaultText = "1.82.0~2018-12-05"), + appMarketingVersion = (defaultText = "1.83.0~2018-12-06"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |