diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-02-01 16:49:06 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-02-01 16:49:06 +0200 |
commit | efa2d99bf40d0f0fd4d89d3001cbb60ee18e18ac (patch) | |
tree | ed6890f993cdf351038db43857d2288fc6df6b47 | |
parent | 8d816cdb0f27656b5b56a6a8d15990bcd5a595e4 (diff) | |
parent | d94f11c7786a48112bd9b024ef7794091b74bb40 (diff) | |
download | wekan-efa2d99bf40d0f0fd4d89d3001cbb60ee18e18ac.tar.gz wekan-efa2d99bf40d0f0fd4d89d3001cbb60ee18e18ac.tar.bz2 wekan-efa2d99bf40d0f0fd4d89d3001cbb60ee18e18ac.zip |
Merge branch 'devel'
-rw-r--r-- | .github/ISSUE_TEMPLATE.md | 2 | ||||
-rw-r--r-- | CHANGELOG.md | 15 | ||||
-rw-r--r-- | client/components/lists/list.js | 4 | ||||
-rw-r--r-- | client/components/lists/listsGroup.js | 13 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.jade | 4 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.js | 12 | ||||
-rw-r--r-- | i18n/he.i18n.json | 8 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
9 files changed, 48 insertions, 16 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 6a1a4fc6..a9e08009 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -10,7 +10,7 @@ * ROOT_URL environment variable (Is there a subfolder?): **Problem description**: -- *be as explicit has you can* +- *be as explicit as you can* - *describe the problem and its symptoms* - *explain how to reproduce* - *attach whatever information that can help understanding the context (screen capture, log files)* diff --git a/CHANGELOG.md b/CHANGELOG.md index da19c7f8..8552a64e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,19 @@ -# v0.68 Wekan release +# v0.69 2018-02-01 Wekan release This release fixes the following bugs: -* [Fix: Trello board import fails because of missing "Swimlane id"](https://github.com/wekan/wekan/issues/1442). +- [Fix swimlanes card details bug](https://github.com/wekan/wekan/commit/f6fb05d3f49c656e9890351f5d7c0827bf2605c1); +- [Workaround to avoid swimlanes drag bug](https://github.com/wekan/wekan/commit/d3c110cd8f3ad16a4ced5520c27ab542cc79b548); +- [Fix swimlanes details view in lists only mode](https://github.com/wekan/wekan/commit/ff9ca755f338e3c45a1bd726dfbce1c607f2ff4c). +- [Fix typo in issue template](https://github.com/wekan/wekan/pull/1451). + +Thanks to GitHub users andresmanelli and d-Rickyy-b for their contributions. + +# v0.68 2018-01-30 Wekan release + +This release fixes the following bugs: + +* [Partial fix: Trello board import fails because of missing "Swimlane id"](https://github.com/wekan/wekan/issues/1442), still needs some work. Thanks to GitHub user xet7 for contributions. diff --git a/client/components/lists/list.js b/client/components/lists/list.js index e922a3fd..ce18ce14 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -18,7 +18,9 @@ BlazeComponent.extendComponent({ // callback, we basically solve all issues related to reactive updates. A // comment below provides further details. onRendered() { - const boardComponent = this.parentComponent().parentComponent(); + let boardComponent = this.parentComponent().parentComponent(); + if (!boardComponent) + boardComponent = this.parentComponent(); const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)'; const $cards = this.$('.js-minicards'); $cards.sortable({ diff --git a/client/components/lists/listsGroup.js b/client/components/lists/listsGroup.js new file mode 100644 index 00000000..f94f681f --- /dev/null +++ b/client/components/lists/listsGroup.js @@ -0,0 +1,13 @@ +BlazeComponent.extendComponent({ + currentCardIsInThisList(listId, swimlaneId) { + const currentCard = Cards.findOne(Session.get('currentCard')); + const currentBoardId = Session.get('currentBoard'); + const board = Boards.findOne(currentBoardId); + if (board.view === 'board-view-lists') + return currentCard && currentCard.listId === listId; + else if (board.view === 'board-view-swimlanes') + return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; + else + return false; + }, +}).register('listsGroup'); diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index 77afa399..765f6d49 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -14,7 +14,7 @@ template(name="swimlane") else each currentBoard.lists +list(this) - if currentCardIsInThisList + if currentCardIsInThisList _id ../_id +cardDetails(currentCard) if currentUser.isBoardMember +addListForm @@ -33,7 +33,7 @@ template(name="listsGroup") else each currentBoard.lists +list(this) - if currentCardIsInThisList + if currentCardIsInThisList _id null +cardDetails(currentCard) if currentUser.isBoardMember +addListForm diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 397f9e9b..211f84f2 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -28,10 +28,16 @@ BlazeComponent.extendComponent({ }); }, - currentCardIsInThisList() { + currentCardIsInThisList(listId, swimlaneId) { const currentCard = Cards.findOne(Session.get('currentCard')); - const listId = this.currentData()._id; - return currentCard && currentCard.listId === listId; //TODO: AND IN THIS SWIMLANE + const currentBoardId = Session.get('currentBoard'); + const board = Boards.findOne(currentBoardId); + if (board.view === 'board-view-lists') + return currentCard && currentCard.listId === listId; + else if (board.view === 'board-view-swimlanes') + return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; + else + return false; }, events() { diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 74abf889..631c5e6c 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -44,7 +44,7 @@ "add-attachment": "הוספת קובץ מצורף", "add-board": "הוספת לוח", "add-card": "הוספת כרטיס", - "add-swimlane": "Add Swimlane", + "add-swimlane": "הוסף מסלול שחייה", "add-checklist": "הוספת רשימת מטלות", "add-checklist-item": "הוספת פריט לרשימת משימות", "add-cover": "הוספת כיסוי", @@ -95,8 +95,8 @@ "boardChangeWatchPopup-title": "שינוי הגדרת המעקב", "boardMenuPopup-title": "תפריט לוח", "boards": "לוחות", - "board-view": "Board View", - "board-view-swimlanes": "Swimlanes", + "board-view": "תצוגת לוח", + "board-view-swimlanes": "מסלול שחייה", "board-view-lists": "רשימות", "bucket-example": "כמו למשל „רשימת המשימות“", "cancel": "ביטול", @@ -350,7 +350,7 @@ "overtime-hours": "שעות נוספות", "overtime": "שעות נוספות", "has-overtime-cards": "יש כרטיסי שעות נוספות", - "has-spenttime-cards": "Has spent time cards", + "has-spenttime-cards": "ניצל את כרטיסי הזמן שהושקע", "time": "זמן", "title": "כותרת", "tracking": "מעקב", diff --git a/package.json b/package.json index 6efbe2dc..abaf94d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.68.0", + "version": "0.69.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 3b635864..71f64fad 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 = 53, + appVersion = 54, # Increment this for every release. - appMarketingVersion = (defaultText = "0.68.0~2018-01-29"), + appMarketingVersion = (defaultText = "0.69.0~2018-02-01"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |