cut staging from master #1070

Merged
jessopb merged 3 commits from master into staging 2020-06-10 23:14:01 +02:00
Showing only changes of commit dfa6db6276 - Show all commits

View file

@ -104,6 +104,7 @@ export default (db, table, sequelize) => ({
.findAll({
where: {
name: claimName,
claim_type: 1,
publisher_id: channelClaimId,
bid_state: { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] },
},
@ -215,6 +216,7 @@ export default (db, table, sequelize) => ({
.findAll({
where: {
name: claimName,
claim_type: 1,
publisher_id: channelId,
},
})