Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions application/controllers/ContactGroupsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use ipl\Html\Form;
use ipl\Html\HtmlString;
use ipl\Html\TemplateString;
use ipl\Sql\Expression;
use ipl\Stdlib\Filter;
use ipl\Web\Compat\CompatController;
use ipl\Web\Compat\SearchControls;
Expand Down Expand Up @@ -91,8 +92,8 @@ public function indexAction(): void
);

$emptyStateMessage = null;
if (Contact::on(Database::get())->columns('1')->limit(1)->first() === null) {
if (Channel::on(Database::get())->columns('1')->limit(1)->first() === null) {
if (Contact::on(Database::get())->columns([new Expression('1')])->limit(1)->first() === null) {
if (Channel::on(Database::get())->columns([new Expression('1')])->limit(1)->first() === null) {
$addButton->disable($this->translate('A channel is required to add a contact group'));

$emptyStateMessage = TemplateString::create(
Expand Down
5 changes: 3 additions & 2 deletions application/forms/ChannelForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use ipl\I18n\GettextTranslator;
use ipl\I18n\StaticTranslator;
use ipl\Sql\Connection;
use ipl\Sql\Expression;
use ipl\Stdlib\Filter;
use ipl\Validator\EmailAddressValidator;
use ipl\Web\Common\CsrfCounterMeasure;
Expand Down Expand Up @@ -128,13 +129,13 @@ protected function assemble(): void

if ($this->channelId !== null) {
$isInUse = Contact::on($this->db)
->columns('1')
->columns([new Expression('1')])
->filter(Filter::equal('default_channel_id', $this->channelId))
->first();

if ($isInUse === null) {
$isInUse = RuleEscalationRecipient::on($this->db)
->columns('1')
->columns([new Expression('1')])
->filter(Filter::equal('channel_id', $this->channelId))
->first();
}
Expand Down
2 changes: 1 addition & 1 deletion library/Notifications/Model/Rotation.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public function delete(): void
$requirePriorityUpdate = true;
if (RotationConfigForm::EXPERIMENTAL_OVERRIDES) {
$rotations = self::on($db)
->columns('1')
->columns([new Expression('1')])
->filter(Filter::equal('schedule_id', $this->schedule_id))
->filter(Filter::equal('priority', $this->priority))
->first();
Expand Down
Loading