mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 01:47:22 +08:00
FIX: Disable cast votes button for multiple polls with no min.
Multiple polls can be created without the min attribute but that means the attribute defaults to 1. A default of 0 does not make any sense because it is equivalent to saying that a user is not casting any votes.
This commit is contained in:
parent
c908fa2f5b
commit
cd13524e26
|
@ -813,8 +813,9 @@ export default createWidget("discourse-poll", {
|
||||||
min() {
|
min() {
|
||||||
let min = parseInt(this.attrs.poll.min, 10);
|
let min = parseInt(this.attrs.poll.min, 10);
|
||||||
if (isNaN(min) || min < 0) {
|
if (isNaN(min) || min < 0) {
|
||||||
min = 0;
|
min = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return min;
|
return min;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -51,37 +51,6 @@ discourseModule(
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
pretender.put("/polls/vote", () => {
|
|
||||||
++requests;
|
|
||||||
return [
|
|
||||||
200,
|
|
||||||
{ "Content-Type": "application/json" },
|
|
||||||
{
|
|
||||||
poll: {
|
|
||||||
name: "poll",
|
|
||||||
type: "regular",
|
|
||||||
status: "open",
|
|
||||||
results: "always",
|
|
||||||
options: [
|
|
||||||
{
|
|
||||||
id: "1f972d1df351de3ce35a787c89faad29",
|
|
||||||
html: "yes",
|
|
||||||
votes: 1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "d7ebc3a9beea2e680815a1e4f57d6db6",
|
|
||||||
html: "no",
|
|
||||||
votes: 0,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
voters: 1,
|
|
||||||
chart_type: "bar",
|
|
||||||
},
|
|
||||||
vote: ["1f972d1df351de3ce35a787c89faad29"],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
const template = hbs`{{mount-widget
|
const template = hbs`{{mount-widget
|
||||||
widget="discourse-poll"
|
widget="discourse-poll"
|
||||||
args=(hash id=id
|
args=(hash id=id
|
||||||
|
@ -180,5 +149,47 @@ discourseModule(
|
||||||
assert.ok(!exists(".chosen"));
|
assert.ok(!exists(".chosen"));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
componentTest("voting on a multiple poll with no min attribute", {
|
||||||
|
template,
|
||||||
|
|
||||||
|
beforeEach() {
|
||||||
|
this.setProperties({
|
||||||
|
post: EmberObject.create({
|
||||||
|
id: 42,
|
||||||
|
topic: {
|
||||||
|
archived: false,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
poll: EmberObject.create({
|
||||||
|
name: "poll",
|
||||||
|
type: "multiple",
|
||||||
|
status: "open",
|
||||||
|
results: "always",
|
||||||
|
max: 2,
|
||||||
|
options: [
|
||||||
|
{ id: "1f972d1df351de3ce35a787c89faad29", html: "yes", votes: 0 },
|
||||||
|
{ id: "d7ebc3a9beea2e680815a1e4f57d6db6", html: "no", votes: 0 },
|
||||||
|
],
|
||||||
|
voters: 0,
|
||||||
|
chart_type: "bar",
|
||||||
|
}),
|
||||||
|
vote: [],
|
||||||
|
groupableUserFields: [],
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
async test(assert) {
|
||||||
|
assert.ok(exists(".poll-buttons .cast-votes[disabled=true]"));
|
||||||
|
|
||||||
|
await click(
|
||||||
|
"li[data-poll-option-id='1f972d1df351de3ce35a787c89faad29']"
|
||||||
|
);
|
||||||
|
|
||||||
|
await click(".poll-buttons .cast-votes");
|
||||||
|
|
||||||
|
assert.ok(exists(".chosen"));
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user