Merge branch 'master' of https://github.com/whowillcare/wekan into whowillcare-master

4 files changed, 17 insertions, 14 deletions

diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index 9eab6054..98af6d54 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -12,13 +12,13 @@ template(name="swimlane")
           unless currentUser.isCommentOnly
             +addListForm
     else
+      if currentUser.isBoardMember
+        unless currentUser.isCommentOnly
+          +addListForm
       each lists
         +list(this)
         if currentCardIsInThisList _id ../_id
           +cardDetails(currentCard)
-      if currentUser.isBoardMember
-        unless currentUser.isCommentOnly
-          +addListForm
 
 template(name="listsGroup")
   .swimlane.list-group.js-lists
@@ -26,20 +26,20 @@ template(name="listsGroup")
       if currentList
         +list(currentList)
       else
-        each lists
-          +miniList(this)
         if currentUser.isBoardMember
           unless currentUser.isCommentOnly
             +addListForm
+        each lists
+          +miniList(this)
     else
+      if currentUser.isBoardMember
+        unless currentUser.isCommentOnly
+          +addListForm
       each lists
         if visible this
           +list(this)
         if currentCardIsInThisList _id null
           +cardDetails(currentCard)
-      if currentUser.isBoardMember
-        unless currentUser.isCommentOnly
-          +addListForm
 
 template(name="addListForm")
   .list.list-composer.js-list-composer(class="{{#if isMiniScreen}}mini-list{{/if}}")
diff --git a/client/lib/filter.js b/client/lib/filter.js
index 9ddea65c..592eb4ab 100644
--- a/client/lib/filter.js
+++ b/client/lib/filter.js
@@ -477,7 +477,9 @@ Filter = {
     return (
       _.any(this._fields, fieldName => {
         return this[fieldName]._isActive();
-      }) || this.advanced._isActive()
+      }) ||
+      this.advanced._isActive() ||
+      this.lists._isActive()
     );
   },
 
diff --git a/models/cards.js b/models/cards.js
index 27dda0ee..1c56a6d2 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1696,10 +1696,11 @@ if (Meteor.isServer) {
       const activityType = `a-${action}`;
       const card = Cards.findOne(doc._id);
       const list = card.list();
-      if (list && action === 'endAt') {
-        // change list modifiedAt
+      if (list) {
+        // change list modifiedAt, when user modified the key values in timingaction array, if it's endAt, put the modifiedAt of list back to one year ago for sorting purpose
         const modifiedAt = new Date(
-          new Date(value).getTime() - 365 * 24 * 3600 * 1e3,
+          new Date(value).getTime() -
+            (action === 'endAt' ? 365 * 24 * 3600 * 1e3 : 0),
         ); // set it as 1 year before
         const boardId = list.boardId;
         Lists.direct.update(
diff --git a/models/users.js b/models/users.js
index 72d64c1c..83a224ba 100644
--- a/models/users.js
+++ b/models/users.js
@@ -396,8 +396,8 @@ Users.helpers({
     return ret;
   },
   hasSortBy() {
-    // if use has dragHandle, then we can let user to choose sort list by different order
-    return this.hasShowDesktopDragHandles();
+    // if use doesn't have dragHandle, then we can let user to choose sort list by different order
+    return !this.hasShowDesktopDragHandles();
   },
   getListSortBy() {
     return this._getListSortBy()[0];