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
14 changes: 7 additions & 7 deletions app/src/Command/UpgradeCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -427,12 +427,12 @@ protected function cacheEnvSourcespMode(): void
{
$EnvSourcesTable = $this->getTableLocator()->get('EnvSource.EnvSources');

$this->EnvSourceSpMode = $EnvSourcesTable->find('list', [
'keyField' => 'id',
'valueField' => 'sp_mode'
])
->applyOptions(['archived' => true])
->toArray();
$this->EnvSourceSpMode = $EnvSourcesTable->find('list',
keyField: 'id',
valueField: 'sp_mode'
)
->applyOptions(['archived' => true])
->toArray();
}

/**
Expand Down Expand Up @@ -482,7 +482,7 @@ protected function buildGroupTree() {
// as a whole, so we only need to run this once.

$GroupsTable = $this->getTableLocator()->get('Groups');
$GroupsTable->recover();
$GroupsTable->getBehavior('Tree')->recover();
}

/**
Expand Down
11 changes: 4 additions & 7 deletions app/src/Model/Table/GroupsTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -1021,14 +1021,11 @@ public function localAfterSave(EventInterface $event, EntityInterface $entity, \
public function marshalProvisioningData(int $id): array {
$ret = [];

$ret['data'] = $this->get($id, [
$ret['data'] = $this->get($id,
// We need archives for handling deleted records
'archived' => true,
'contain' => [
'GroupMembers',
'Identifiers'
]
]);
archived: true,
contain: ['GroupMembers', 'Identifiers']
);

// Provisioning Eligibility is
// - Deleted if the changelog deleted flag is true
Expand Down