From 2bf004120d5a43cd3c3c060fc7c0c30d1b01f220 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 3 Jan 2020 06:49:35 +0200
Subject: Add Worker role. Add more Font Awesome icons. Fix browser console
 errors when editing user profile name etc.

Thanks to xet7 !

Closes #2788
---
 client/components/cards/cardDate.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'client/components/cards/cardDate.js')

diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index cb54b033..c4b5c6d8 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -97,7 +97,8 @@ Template.dateBadge.helpers({
     return (
       Meteor.user() &&
       Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
     );
   },
 });
-- 
cgit v1.2.3-1-g7c22


From 27943796ade78ca3c503637a1340918bf06a1267 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 3 Jan 2020 16:02:31 +0200
Subject: Revert to Wekan v3.57 version of client and models directories,
 removing Worker role temporarily, because Worker role changes broke saving
 card.

Thanks to xet7 !
---
 client/components/cards/cardDate.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'client/components/cards/cardDate.js')

diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index c4b5c6d8..cb54b033 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -97,8 +97,7 @@ Template.dateBadge.helpers({
     return (
       Meteor.user() &&
       Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
+      !Meteor.user().isCommentOnly()
     );
   },
 });
-- 
cgit v1.2.3-1-g7c22


From f6f7705f23ea18d7f1b8f8736b762eb89e00a3cf Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sun, 5 Jan 2020 21:28:14 +0200
Subject: Add Worker role. This was originally added at Wekan v3.58, reverted
 at Wekan v3.60 because of bugs, and now after fixes added back.

Thanks to xet7 !

Closes #2788
---
 client/components/cards/cardDate.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'client/components/cards/cardDate.js')

diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index cb54b033..c4b5c6d8 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -97,7 +97,8 @@ Template.dateBadge.helpers({
     return (
       Meteor.user() &&
       Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
     );
   },
 });
-- 
cgit v1.2.3-1-g7c22