Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixes #2638 importing trello

Browse source
This commit is contained in:
Justin Reynolds 2019-08-22 16:05:41 -05:00
parent 2c78aab3dc
commit 9d8a38f324
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/components/import/import.js
View file

@ -211,22 +211,20 @@ BlazeComponent.extendComponent({
this.parentComponent().nextStep(); this.parentComponent().nextStep();
}, },
onMapMember(evt) {
const memberToMap = this.currentData();
if (memberToMap.wekan) {
// todo xxx ask for confirmation?
this.unmapMember(memberToMap.id);
} else {
this.setSelectedMember(memberToMap.id);
Popup.open('importMapMembersAdd')(evt);
}
},
events() { events() {
return [ return [
{ {
submit: this.onSubmit, submit: this.onSubmit,
'click .js-select-member': this.onMapMember, 'click .js-select-member'(evt) {
const memberToMap = this.currentData();
if (memberToMap.wekan) {
// todo xxx ask for confirmation?
this.unmapMember(memberToMap.id);
} else {
this.setSelectedMember(memberToMap.id);
Popup.open('importMapMembersAdd')(evt);
}
},
}, },
]; ];
}, },

2
client/lib/popup.js
View file

@ -67,7 +67,7 @@ window.Popup = new (class {
title: self._getTitle(popupName), title: self._getTitle(popupName),
depth: self._stack.length, depth: self._stack.length,
offset: self._getOffset(openerElement), offset: self._getOffset(openerElement),
dataContext: (this.currentData && this.currentData()) || this, dataContext: (this && this.currentData && this.currentData()) || this,
}); });
// If there are no popup currently opened we use the Blaze API to render // If there are no popup currently opened we use the Blaze API to render