Skip to content

fix #4183 【コンテンツ】コンテンツ管理でコンテンツを追加したタイミングではそのコンテンツに対する権限チェックが動作していない件を修正 #4427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaburk wants to merge 1 commit into
base: 5.2.x
Choose a base branch
from
Open

fix #4183 【コンテンツ】コンテンツ管理でコンテンツを追加したタイミングではそのコンテンツに対する権限チェックが動作していない件を修正 #4427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions plugins/baser-core/src/View/Helper/BcContentsHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function setup()

$existsTitles = $this->_getExistsTitles();
$user = BcUtil::loginUser();

$userGroupIds = $user ? Hash::extract($user->user_groups ?? [], '{n}.id') : [];
foreach($items as $type => $item) {

// title
Expand Down Expand Up @@ -146,11 +146,27 @@ public function setup()
}
// disabled
if (!empty($item['url']['add'])) {
$item['addDisabled'] = !($this->PermissionsService->check($item['permissionCheckUrl']['add'],
Hash::extract($user->user_groups, '{n}.id')));
$item['addDisabled'] = !($this->PermissionsService->check($item['permissionCheckUrl']['add'], $userGroupIds));
} else {
$item['addDisabled'] = true;
}

// 追加直後にフロント側でノードを動的生成する際にも権限状態を反映できるよう保持する
if (!empty($item['url']['edit'])) {
$item['editDisabled'] = !($this->PermissionsService->check($item['permissionCheckUrl']['edit'], $userGroupIds));
} else {
$item['editDisabled'] = true;
}
if (!empty($item['url']['manage'])) {
$item['manageDisabled'] = !($this->PermissionsService->check($item['permissionCheckUrl']['manage'], $userGroupIds));
} else {
$item['manageDisabled'] = true;
}
if (!empty($item['url']['delete'])) {
$item['deleteDisabled'] = !($this->PermissionsService->check($item['permissionCheckUrl']['delete'], $userGroupIds));
} else {
$item['deleteDisabled'] = true;
}
$items[$type] = $item;
}
$this->setConfig('items', $items);
Expand Down
13 changes: 13 additions & 0 deletions plugins/baser-core/tests/TestCase/View/Helper/BcContentsHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,19 @@ public function testSetUp(): void
$result = $this->BcContents->getConfig('items');
$this->assertNotNull($result);
$this->assertEquals('無所属コンテンツ', $result["Default"]["title"]);

// editDisabled/manageDisabled/deleteDisabled が各アイテムにセットされることを確認
foreach ($result as $type => $item) {
$this->assertArrayHasKey('editDisabled', $item, "type:{$type} に editDisabled がない");
$this->assertArrayHasKey('manageDisabled', $item, "type:{$type} に manageDisabled がない");
$this->assertArrayHasKey('deleteDisabled', $item, "type:{$type} に deleteDisabled がない");
$this->assertIsBool($item['editDisabled'], "type:{$type} の editDisabled が bool でない");
$this->assertIsBool($item['manageDisabled'], "type:{$type} の manageDisabled が bool でない");
$this->assertIsBool($item['deleteDisabled'], "type:{$type} の deleteDisabled が bool でない");
}

// manage URL が存在しない ContentFolder は manageDisabled = true になる
$this->assertTrue($result['ContentFolder']['manageDisabled']);
}

/**
Expand Down
6 changes: 6 additions & 0 deletions plugins/bc-admin-third/src/js/admin/common/lib/jquery.bcTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,12 @@
data.contentId = result.content.id;
data.contentEntityId = result.content.entity_id;
data.name = decodeURIComponent(result.content.name);
var settingsKey = data.alias ? 'ContentAlias' : data.contentType;
if ($.bcTree.settings[settingsKey] !== undefined) {
data.editDisabled = !!$.bcTree.settings[settingsKey].editDisabled;
data.manageDisabled = !!$.bcTree.settings[settingsKey].manageDisabled;
data.deleteDisabled = !!$.bcTree.settings[settingsKey].deleteDisabled;
}
node.data.jstree = data;
$.bcTree.refreshTree();
},
Expand Down
Loading
Loading