summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorAngelo Gallarello <angelo.gallarell@gmail.com>2018-09-21 14:53:04 +0200
committerAngelo Gallarello <angelo.gallarell@gmail.com>2018-09-21 14:53:04 +0200
commit1f02321e2767a4772a35f512fa29798b6aeadb9a (patch)
treeb789f9805243b186d7514f5f416ac5506fba522d /client/components
parent37a53e7466107d229a67a4c2efc4b25708bbe93d (diff)
downloadwekan-1f02321e2767a4772a35f512fa29798b6aeadb9a.tar.gz
wekan-1f02321e2767a4772a35f512fa29798b6aeadb9a.tar.bz2
wekan-1f02321e2767a4772a35f512fa29798b6aeadb9a.zip
Fixed rules about member and box dropdowns width
Diffstat (limited to 'client/components')
-rw-r--r--client/components/rules/actions/cardActions.js8
-rw-r--r--client/components/rules/rules.styl2
-rw-r--r--client/components/rules/triggers/cardTriggers.js10
3 files changed, 10 insertions, 10 deletions
diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js
index a65407c1..b04440bd 100644
--- a/client/components/rules/actions/cardActions.js
+++ b/client/components/rules/actions/cardActions.js
@@ -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,
});
diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl
index 68d74d32..45ce4003 100644
--- a/client/components/rules/rules.styl
+++ b/client/components/rules/rules.styl
@@ -116,7 +116,7 @@
.trigger-dropdown
display:inline-block
select
- width:100px
+ width:auto
height:30px
margin:0px
margin-left:5px
diff --git a/client/components/rules/triggers/cardTriggers.js b/client/components/rules/triggers/cardTriggers.js
index 704c7690..2303a85b 100644
--- a/client/components/rules/triggers/cardTriggers.js
+++ b/client/components/rules/triggers/cardTriggers.js
@@ -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,
});
}