mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 05:28:18 +01:00
Code Issues Projects Releases Wiki Activity

Fix a bug where notifications are send because the end of the maintenance time is set

Browse Source
This commit is contained in:
Nico Stapelbroek 2018-01-21 13:35:30 +01:00
parent e358332048
commit 53142e2c93
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Integrations/Core/System.php
View File

@ -115,7 +115,7 @@ class System implements SystemContract
return true;
}
return !$this->config->get('suppress_notifications_in_maintenance');
return !$this->config->get('setting.suppress_notifications_in_maintenance');
}
/**

4
app/Models/Schedule.php
View File

@ -161,7 +161,9 @@ class Schedule extends Model implements HasPresenter
*/
public function scopeInProgress(Builder $query)
{
return $query->where('scheduled_at', '<=', Carbon::now())->whereNull('completed_at')->where('status', '!=', self::COMPLETE);
return $query->where('scheduled_at', '<=', Carbon::now())->where('status', '!=', self::COMPLETE)->where(function($query) {
$query->whereNull('completed_at')->orWhere('completed_at','>', Carbon::now());
});
}
/**