From 828f6ea321020eda77fea399df52889e2081dfac Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 May 2019 20:50:53 +0300 Subject: [PATCH 1/4] - Add Feature: Move board to Archive button at each board at All Boards page. Thanks to xet7 ! Related #2389 --- client/components/boards/boardsList.jade | 5 +++-- client/components/boards/boardsList.js | 5 +++++ client/components/boards/boardsList.styl | 14 ++++++++++++++ models/boards.js | 16 ++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade index 70b29c493..0739def6f 100644 --- a/client/components/boards/boardsList.jade +++ b/client/components/boards/boardsList.jade @@ -30,8 +30,9 @@ template(name="boardList") i.fa.js-clone-board( class="fa-clone" title="{{_ 'duplicate-board'}}") - - + i.fa.js-archive-board( + class="fa-archive" + title="{{_ 'archive-board'}}") template(name="boardListHeaderBar") h1 {{_ 'my-boards'}} diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 8c45fbe28..e97070ee1 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -70,6 +70,11 @@ BlazeComponent.extendComponent({ ); evt.preventDefault(); }, + 'click .js-archive-board'(evt) { + const boardId = this.currentData()._id; + Meteor.call('archiveBoard', boardId); + evt.preventDefault(); + }, 'click .js-accept-invite'() { const boardId = this.currentData()._id; Meteor.user().removeInvite(boardId); diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl index 7e8344118..42cb354d7 100644 --- a/client/components/boards/boardsList.styl +++ b/client/components/boards/boardsList.styl @@ -106,15 +106,29 @@ $spaceBetweenTiles = 16px transition-duration: .15s transition-property: color, font-size, background + .fa-archive + position: absolute; + bottom: 0 + font-size: 14px + height: 18px + line-height: 18px + opacity: 0 + left: 0 + padding: 9px 9px + transition-duration: .15s + transition-property: color, font-size, background + li:hover a &:hover .fa-star, .fa-clone, + .fa-archive, .fa-star-o color: white .fa-star, .fa-clone, + .fa-archive, .fa-star-o color: white opacity: .75 diff --git a/models/boards.js b/models/boards.js index b07d9e279..396d90fb1 100644 --- a/models/boards.js +++ b/models/boards.js @@ -867,6 +867,22 @@ if (Meteor.isServer) { } else throw new Meteor.Error('error-board-doesNotExist'); }, }); + + Meteor.methods({ + archiveBoard(boardId) { + check(boardId, String); + const board = Boards.findOne(boardId); + if (board) { + const userId = Meteor.userId(); + const index = board.memberIndex(userId); + if (index >= 0) { + board.archive(); + return true; + } else throw new Meteor.Error('error-board-notAMember'); + } else throw new Meteor.Error('error-board-doesNotExist'); + }, + }); + } if (Meteor.isServer) { From fca87b53f008eeedd970281f9ffc75c709c3c199 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 May 2019 20:55:35 +0300 Subject: [PATCH 2/4] Update changelog. --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66442ebc6..6a3f7b295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release adds the following new features: + +- [Move board to Archive button at each board at All Boards page](https://github.com/wekan/wekan/commit/828f6ea321020eda77fea399df52889e2081dfac). + Thanks to xet7. Related #2389 + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.66 2019-05-09 Wekan release This release adds the following new features: From 88ffddfebab5df40b6a198588e39640fff436618 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 May 2019 20:58:35 +0300 Subject: [PATCH 3/4] Update changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a3f7b295..c0596a3fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This release adds the following new features: - [Move board to Archive button at each board at All Boards page](https://github.com/wekan/wekan/commit/828f6ea321020eda77fea399df52889e2081dfac). Thanks to xet7. Related #2389 +- [If adding Subtasks does not work on old board, added wiki page how to make it work again](https://github.com/wekan/wekan/wiki/Subtasks). + Thanks to xet7. Thanks to above GitHub users for their contributions and translators for their translations. From ab4dab2ade0577d4eb344f8b940e3b8ccafbe626 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 May 2019 21:01:34 +0300 Subject: [PATCH 4/4] v2.67 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0596a3fc..28c01948b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.67 2019-05-10 Wekan release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index 3e25f0e83..2302fa1c1 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.66.0" +appVersion: "v2.67.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 13e971e07..7cc5eb821 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.66.0", + "version": "v2.67.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index fc5393d09..2dfe5591a 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 = 268, + appVersion = 269, # Increment this for every release. - appMarketingVersion = (defaultText = "2.66.0~2019-05-09"), + appMarketingVersion = (defaultText = "2.67.0~2019-05-10"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,