github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bronger-sorted-archives'

Browse source
This commit is contained in:
Lauri Ojansivu 2021-02-02 21:09:41 +02:00
commit c42d0d7423
9 changed files with 61 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/boards/boardArchive.js
View file

@ -11,7 +11,7 @@ BlazeComponent.extendComponent({
return Boards.find(
{ archived: true },
{
sort: { sort: 1 /* boards default sorting */ },
sort: { archivedAt: -1, modifiedAt: -1 },
},
);
},

15
client/components/sidebar/sidebarArchives.jade
View file

@ -14,6 +14,11 @@ template(name="archivesSidebar")
if currentUser.isBoardMember
unless isWorker
p.quiet
if this.archivedAt
| {{_ 'archived-at' }}
|
| {{ moment this.archivedAt 'LLL' }}
br
a.js-restore-card {{_ 'restore'}}
if currentUser.isBoardAdmin
| -
@ -37,6 +42,11 @@ template(name="archivesSidebar")
if currentUser.isBoardMember
unless isWorker
p.quiet
if this.archivedAt
| {{_ 'archived-at' }}
|
| {{ moment this.archivedAt 'LLL' }}
br
a.js-restore-list {{_ 'restore'}}
if currentUser.isBoardAdmin
| -
@ -58,6 +68,11 @@ template(name="archivesSidebar")
if currentUser.isBoardMember
unless isWorker
p.quiet
if this.archivedAt
| {{_ 'archived-at' }}
|
| {{ moment this.archivedAt 'LLL' }}
br
a.js-restore-swimlane {{_ 'restore'}}
if currentUser.isBoardAdmin
| -

6
client/components/sidebar/sidebarArchives.js
View file

@ -34,6 +34,8 @@ BlazeComponent.extendComponent({
return Cards.find({
archived: true,
boardId: Session.get('currentBoard'),
}, {
sort: { archivedAt: -1, modifiedAt: -1 },
});
},
@ -41,6 +43,8 @@ BlazeComponent.extendComponent({
return Lists.find({
archived: true,
boardId: Session.get('currentBoard'),
}, {
sort: { archivedAt: -1, modifiedAt: -1 },
});
},
@ -48,6 +52,8 @@ BlazeComponent.extendComponent({
return Swimlanes.find({
archived: true,
boardId: Session.get('currentBoard'),
}, {
sort: { archivedAt: -1, modifiedAt: -1 },
});
},

3
i18n/en.i18n.json
View file

@ -951,5 +951,6 @@
"excel-font": "Arial",
"number": "Number",
"label-colors": "Label Colors",
"label-names": "Label Names"
"label-names": "Label Names",
"archived-at": "archived at"
}

9
models/boards.js
View file

@ -43,6 +43,13 @@ Boards.attachSchema(
}
},
},
archivedAt: {
/**
* Latest archiving time of the board
*/
type: Date,
optional: true,
},
createdAt: {
/**
* Creation time of the board
@ -1042,7 +1049,7 @@ Boards.helpers({
Boards.mutations({
archive() {
return { $set: { archived: true } };
return { $set: { archived: true, archivedAt: new Date() } };
},
restore() {

8
models/cards.js
View file

@ -26,6 +26,13 @@ Cards.attachSchema(
}
},
},
archivedAt: {
/**
* latest archiving date
*/
type: Date,
optional: true,
},
parentId: {
/**
* ID of the parent card
@ -1449,6 +1456,7 @@ Cards.mutations({
return {
$set: {
archived: true,
archivedAt: new Date(),
},
};
},

10
models/lists.js
View file

@ -32,6 +32,13 @@ Lists.attachSchema(
}
},
},
archivedAt: {
/**
* latest archiving date
*/
type: Date,
optional: true,
},
boardId: {
/**
* the board associated to this list
@ -292,7 +299,7 @@ Lists.mutations({
return card.archive();
});
}
return { $set: { archived: true } };
return { $set: { archived: true, archivedAt: new Date() } };
},
restore() {
@ -384,6 +391,7 @@ if (Meteor.isServer) {
Meteor.startup(() => {
Lists._collection._ensureIndex({ modifiedAt: -1 });
Lists._collection._ensureIndex({ boardId: 1 });
Lists._collection._ensureIndex({ archivedAt: -1 });
});
Lists.after.insert((userId, doc) => {

9
models/swimlanes.js
View file

@ -23,6 +23,13 @@ Swimlanes.attachSchema(
}
},
},
archivedAt: {
/**
* latest archiving date of the swimlane
*/
type: Date,
optional: true,
},
boardId: {
/**
* the ID of the board the swimlane is attached to
@ -259,7 +266,7 @@ Swimlanes.mutations({
return list.archive();
});
}
return { $set: { archived: true } };
return { $set: { archived: true, archivedAt: new Date() } };
},
restore() {

5
server/publications/boards.js
View file

@ -63,8 +63,11 @@ Meteor.publish('archivedBoards', function() {
archived: 1,
slug: 1,
title: 1,
createdAt: 1,
modifiedAt: 1,
archivedAt: 1,
},
sort: { sort: 1 /* boards default sorting */ },
sort: { archivedAt: -1, modifiedAt: -1 },
},
);
});