v3.62

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

CHANGELOG.md

@@ -1,6 +1,54 @@
+# v3.62 2020-01-05 Wekan release
+
+This release adds the following features:
+
+- [Add Worker role](https://github.com/wekan/wekan/issues/2788).
+  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.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.61 2020-01-03 Wekan release
+
+This release adds the following features:
+
+- [Add more Font Awesome icons. This was originally added
+  at Wekan v3.58, removed at Wekan v3.60, and now
+  added back at Wekan v3.61](https://github.com/wekan/wekan/commit/cd253522a305523e3e36bb73313e8c4db500a717).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix browser javascript console errors when editing profile. This was originally added
+  at Wekan v3.58, removed at Wekan v3.60, and now added back at
+  Wekan v3.61](https://github.com/wekan/wekan/commit/cd253522a305523e3e36bb73313e8c4db500a717).
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.60 2020-01-03 Wekan release
+
+This release fixes the following bugs:
+
+- [Revert to Wekan v3.57 version of client and models directories,
+  removing Worker role temporarily, because Worker role changes
+  broke saving card](https://github.com/wekan/wekan/commit/27943796ade78ca3c503637a1340918bf06a1267).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.59 2020-01-03 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix not being able to edit received date](https://github.com/wekan/wekan/commit/5376bc7b7905c0dd99fae1aeae3f63b4583a3e3f).
+  Thanks to xet7.    
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v3.58 2020-01-03 Wekan release
 
-This release adds the following features and fixes:
+This release adds the following features:
 
 - [Add Worker role](https://github.com/wekan/wekan/issues/2788). Thanks to xet7.
 - [Add more Font Awesome icons](https://github.com/wekan/wekan/commit/2bf004120d5a43cd3c3c060fc7c0c30d1b01f220).

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v3.58.0"
+appVersion: "v3.62.0"
 files:
   userUploads:
     - README.md

client/components/cards/cardDetails.jade

@@ -1,7 +1,7 @@
 template(name="cardDetails")
   section.card-details.js-card-details.js-perfect-scrollbar: .card-details-canvas
     .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}')
-      +inlinedForm(classNames="{{#if canModifyCardWorker}}js-card-details-title{{/if}}")
+      +inlinedForm(classNames="js-card-details-title")
         +editCardTitleForm
       else
         unless isMiniScreen
@@ -13,7 +13,7 @@ template(name="cardDetails")
           if currentUser.isBoardMember
             a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu
         h2.card-details-title.js-card-title(
-          class="{{#if canModifyCardWorker}}js-open-inlined-form is-editable{{/if}}")
+          class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
             +viewer
               = getTitle
             if isWatching
@@ -101,10 +101,14 @@ template(name="cardDetails")
           +userAvatarAssignee(userId=this cardId=../_id)
           | {{! XXX Hack to hide syntaxic coloration /// }}
         if canModifyCard
+          a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}")
+            i.fa.fa-plus
+        if currentUser.isWorker
           unless assigneeSelected
             a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}")
               i.fa.fa-plus
 
+
       .card-details-item.card-details-item-labels
         h3
           i.fa.fa-tags
@@ -404,7 +408,7 @@ template(name="cardAssigneesPopup")
   if currentUser.isWorker
     ul.pop-over-list.js-card-assignee-list
         li.item(class="{{#if currentUser.isCardAssignee}}active{{/if}}")
-          a.name.js-select-assigneeWorker(href="#")
+          a.name.js-select-assignee(href="#")
             +userAvatar(userId=currentUser._id)
             span.full-name
               = currentUser.profile.fullname

client/components/cards/cardDetails.js

@@ -26,7 +26,6 @@ BlazeComponent.extendComponent({
 
   onCreated() {
     this.currentBoard = Boards.findOne(Session.get('currentBoard'));
-    this.currentUser = Meteor.user();
     this.isLoaded = new ReactiveVar(false);
     const boardBody = this.parentComponent().parentComponent();
     //in Miniview parent is Board, not BoardBody.
@@ -49,14 +48,6 @@ BlazeComponent.extendComponent({
   },
 
   canModifyCard() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
-    );
-  },
-
-  canModifyCardWorker() {
     return (
       Meteor.user() &&
       Meteor.user().isBoardMember() &&
@@ -332,12 +323,7 @@ BlazeComponent.extendComponent({
         'click .js-assignee': Popup.open('cardAssignee'),
         'click .js-add-assignees': Popup.open('cardAssignees'),
         'click .js-add-labels': Popup.open('cardLabels'),
-        'click .js-received-date'(event) {
-          event.preventDefault();
-          if (!Meteor.user().isWorker) {
-            Popup.open('editCardReceivedDate');
-          }
-        },
+        'click .js-received-date': Popup.open('editCardReceivedDate'),
         'click .js-start-date': Popup.open('editCardStartDate'),
         'click .js-due-date': Popup.open('editCardDueDate'),
         'click .js-end-date': Popup.open('editCardEndDate'),
@@ -398,13 +384,6 @@ Template.cardDetails.helpers({
     return user && user.isBoardAdmin() ? 'admin' : 'normal';
   },
 
-  isWorker() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return (
-      !currentBoard.hasAdmin(this.userId) && currentBoard.hasWorker(this.userId)
-    );
-  },
-
   presenceStatusClassName() {
     const user = Users.findOne(this.userId);
     const userPresence = presences.findOne({ userId: this.userId });
@@ -481,15 +460,6 @@ Template.cardDetailsActionsPopup.helpers({
       !Meteor.user().isCommentOnly()
     );
   },
-
-  canModifyCardWorker() {
-    return (
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-    );
-  },
 });
 
 Template.cardDetailsActionsPopup.events({
@@ -498,12 +468,7 @@ Template.cardDetailsActionsPopup.events({
   'click .js-labels': Popup.open('cardLabels'),
   'click .js-attachments': Popup.open('cardAttachments'),
   'click .js-custom-fields': Popup.open('cardCustomFields'),
-  'click .js-received-date'(event) {
-    event.preventDefault();
-    if (!Meteor.user().isWorker) {
-      Popup.open('editCardReceivedDate');
-    }
-  },
+  'click .js-received-date': Popup.open('editCardReceivedDate'),
   'click .js-start-date': Popup.open('editCardStartDate'),
   'click .js-due-date': Popup.open('editCardDueDate'),
   'click .js-end-date': Popup.open('editCardEndDate'),
@@ -915,12 +880,6 @@ Template.cardAssigneesPopup.events({
     card.toggleAssignee(assigneeId);
     event.preventDefault();
   },
-  'click .js-select-assigneeWorker'(event) {
-    const card = Cards.findOne(Session.get('currentCard'));
-    const assigneeId = currentUser._id;
-    card.toggleAssignee(assigneeId);
-    event.preventDefault();
-  },
 });
 
 Template.cardAssigneesPopup.helpers({

client/components/lists/listHeader.jade

@@ -10,7 +10,7 @@ template(name="listHeader")
           a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
       h2.list-header-name(
         title="{{ moment modifiedAt 'LLL' }}"
-        class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}js-open-inlined-form is-editable{{/unless}}{{/if}}")
+        class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}{{#unless currentUser.isWorker}}js-open-inlined-form is-editable{{/unless}}{{/unless}}{{/if}}")
         +viewer
           = title
         if wipLimit.enabled

client/components/swimlanes/swimlanes.js

@@ -94,7 +94,8 @@ function initSortable(boardComponent, $listsDom) {
     return (
       Meteor.user() &&
       Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
     );
   }
 
@@ -131,6 +132,15 @@ function initSortable(boardComponent, $listsDom) {
         // MultiSelection.isActive() || !userIsMember(),
       );
     }
+
+    $listsDom.sortable(
+      'option',
+      'disabled',
+      // Disable drag-dropping when user is not member
+      Meteor.user().isWorker(),
+      // Not disable drag-dropping while in multi-selection mode
+      // MultiSelection.isActive() || !userIsMember(),
+    );
   });
 }
 
@@ -282,7 +292,8 @@ Template.swimlane.helpers({
     return (
       Meteor.user() &&
       Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly()
+      !Meteor.user().isCommentOnly() &&
+      !Meteor.user().isWorker()
     );
   },
 });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.58.0",
+  "version": "v3.62.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.58.0",
+  "version": "v3.62.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

public/api/wekan.html

@@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.58">Wekan REST API v3.58</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.62">Wekan REST API v3.62</a>
             
           </li>
         
@@ -2017,7 +2017,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v3.58</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v3.62</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v3.58
+  version: v3.62
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

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 = 360,
+    appVersion = 364,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "3.58.0~2020-01-03"),
+    appMarketingVersion = (defaultText = "3.62.0~2020-01-05"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,