Merge branch 'devel'

.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)*

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.
 

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({

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');

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

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() {

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": "מעקב",

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": {

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,