clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10836 from nupplaphil/feat/depository_permissionset

Browse Source 
Migrate PermissionSet to Depository paradigm
This commit is contained in:
Hypolite Petovan
2021-10-08 09:39:39 -04:00
committed by GitHub
parent 2488780bc2 93c44e6186
commit 80a8cd86c4
23 changed files with 634 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Module/Settings/Profile/Index.php
View File

@@ -28,6 +28,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\Theme;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Model\ProfileField;
use Friendica\Model\User;
@@ -161,7 +162,9 @@ class Index extends BaseSettings
$profileFields = DI::profileField()->selectByUserId(local_user());
foreach ($profileFields as $profileField) {
/** @var ProfileField $profileField */
$defaultPermissions = ACL::getDefaultUserPermissions($profileField->permissionset->toArray());
$defaultPermissions = $profileField->permissionSet->withAllowedContacts(
Contact::pruneUnavailable($profileField->permissionSet->allow_cid)
);
$custom_fields[] = [
'id' => $profileField->id,
@@ -173,7 +176,7 @@ class Index extends BaseSettings
DI::page(),
$a->getLoggedInUserId(),
false,
$defaultPermissions,
$defaultPermissions->toArray(),
['network' => Protocol::DFRN],
'profile_field[' . $profileField->id . ']'
),