Merge branch 'fix'
This commit is contained in:
@@ -708,7 +708,7 @@ class Service
|
||||
private function fetchWorkingRangeListForTeams(array $teamIdList, FetchParams $fetchParams): array
|
||||
{
|
||||
$teamList = iterator_to_array(
|
||||
$this->entityManager
|
||||
$this->entityManager
|
||||
->getRDBRepositoryByClass(Team::class)
|
||||
->where([Attribute::ID => $teamIdList])
|
||||
->find()
|
||||
@@ -794,6 +794,13 @@ class Service
|
||||
->withFrom($params->from)
|
||||
->withTo($params->to);
|
||||
|
||||
if ($fetchParams->getScopeList() === null) {
|
||||
$fetchParams = $fetchParams->withScopeList(
|
||||
$this->config->get('busyRangesEntityList') ??
|
||||
[Meeting::ENTITY_TYPE, Call::ENTITY_TYPE]
|
||||
);
|
||||
}
|
||||
|
||||
$eventList = $this->fetchInternal($user, $fetchParams->withSkipAcl(), !$params->accessCheck);
|
||||
|
||||
$ignoreHash = (object) [];
|
||||
|
||||
@@ -53,7 +53,11 @@ class RemindersHandler {
|
||||
this.listenTo(this.model, 'change', () => {
|
||||
if (
|
||||
!this.model.hasChanged('assignedUserId') &&
|
||||
!this.model.hasChanged('assignedUsersIds')
|
||||
!this.model.hasChanged('assignedUsersIds') &&
|
||||
!this.model.hasChanged('assignedUsersIds') &&
|
||||
!this.model.hasChanged('dateEnd') &&
|
||||
!this.model.hasChanged('dateEndDate') &&
|
||||
!this.model.hasChanged('status')
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1421,7 +1421,6 @@ export default class extends ModalView {
|
||||
"fas fa-water",
|
||||
"fas fa-water-ladder",
|
||||
"fas fa-wave-square",
|
||||
"fas fa-web-awesome",
|
||||
"fas fa-weight-hanging",
|
||||
"fas fa-weight-scale",
|
||||
"fas fa-wheat-awn",
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "espocrm",
|
||||
"version": "9.0.4",
|
||||
"version": "9.0.5",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "espocrm",
|
||||
"version": "9.0.4",
|
||||
"version": "9.0.5",
|
||||
"hasInstallScript": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "espocrm",
|
||||
"version": "9.0.4",
|
||||
"version": "9.0.5",
|
||||
"description": "Open-source CRM.",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
Reference in New Issue
Block a user