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

Fixed rules about member and box dropdowns width

Browse source
This commit is contained in:
Angelo Gallarello 2018-09-21 14:53:04 +02:00
parent 37a53e7466
commit 1f02321e27
7 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/components/rules/actions/cardActions.js
View file

@ -58,14 +58,14 @@ BlazeComponent.extendComponent({
const ruleName = this.data().ruleName.get();
const trigger = this.data().triggerVar.get();
const actionSelected = this.find('#member-action').value;
const memberName = this.find('#member-name').value;
const username = this.find('#member-name').value;
const boardId = Session.get('currentBoard');
const desc = Utils.getTriggerActionDesc(event, this);
if (actionSelected === 'add') {
const triggerId = Triggers.insert(trigger);
const actionId = Actions.insert({
actionType: 'addMember',
memberName,
username,
boardId,
desc,
});
@ -81,7 +81,7 @@ BlazeComponent.extendComponent({
const triggerId = Triggers.insert(trigger);
const actionId = Actions.insert({
actionType: 'removeMember',
memberName,
username,
boardId,
desc,
});
@ -101,7 +101,7 @@ BlazeComponent.extendComponent({
const boardId = Session.get('currentBoard');
const actionId = Actions.insert({
actionType: 'removeMember',
'memberName': '*',
'username': '*',
boardId,
desc,
});

2
client/components/rules/rules.styl
View file

@ -116,7 +116,7 @@
.trigger-dropdown
display:inline-block
select
width:100px
width:auto
height:30px
margin:0px
margin-left:5px

10
client/components/rules/triggers/cardTriggers.js
View file

@ -67,7 +67,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'joinMember',
boardId,
'memberId': '*',
'username': '*',
desc,
});
}
@ -75,7 +75,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'unjoinMember',
boardId,
'memberId': '*',
'username': '*',
desc,
});
}
@ -84,13 +84,13 @@ BlazeComponent.extendComponent({
const desc = Utils.getTriggerActionDesc(event, this);
const datas = this.data();
const actionSelected = this.find('#spec-member-action').value;
const memberId = this.find('#spec-member').value;
const username = this.find('#spec-member').value;
const boardId = Session.get('currentBoard');
if (actionSelected === 'added') {
datas.triggerVar.set({
activityType: 'joinMember',
boardId,
memberId,
username,
desc,
});
}
@ -98,7 +98,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'unjoinMember',
boardId,
memberId,
username,
desc,
});
}