Skip to content

fix(mgr): пустая карточка товара без resourcegroup_resource_list (#652) #653

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

Merged
biz87 merged 1 commit into from
Sep 7, 2026
+58 −2
Merged

fix(mgr): пустая карточка товара без resourcegroup_resource_list (#652) #653

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
5 changes: 3 additions & 2 deletions assets/components/minishop3/js/mgr/product/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ Ext.extend(ms3.panel.UpdateProduct, ms3.panel.Product, {
// Gallery tab is now inside Vue ProductTabs component
// No need to add it separately here

tabs.push(pageSettingsTab);
tabs.push(accessPermissionsTab);
// Optional tabs: MODX omits access permissions without resourcegroup_resource_list (#652)
pageSettingsTab && tabs.push(pageSettingsTab);
accessPermissionsTab && tabs.push(accessPermissionsTab);

item.items = tabs;
fields.push(item);
Expand Down
55 changes: 55 additions & 0 deletions core/components/minishop3/tests/ProductUpdateAccessTabGuardTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

/**
* Smoke #652: product update must not push undefined access/settings tabs into Ext items.
*
* Run: php tests/ProductUpdateAccessTabGuardTest.php
*/

declare(strict_types=1);

$fail = static function (string $message): never {
fwrite(STDERR, "FAIL ProductUpdateAccessTabGuardTest: {$message}\n");
exit(1);
};

$repoRoot = dirname(__DIR__, 4);
$productUpdate = $repoRoot . '/assets/components/minishop3/js/mgr/product/update.js';
$categoryUpdate = $repoRoot . '/assets/components/minishop3/js/mgr/category/update.js';

foreach ([$productUpdate, $categoryUpdate] as $path) {
if (!is_readable($path)) {
$fail('not readable: ' . $path);
}
}

$productSrc = file_get_contents($productUpdate);
if ($productSrc === false) {
$fail('cannot read product/update.js');
}

// Unguarded pushes regress #652 (undefined tab → blank form for managers without resourcegroup_resource_list).
if (preg_match('/^\s*tabs\.push\(pageSettingsTab\);\s*$/m', $productSrc) === 1) {
$fail('product/update.js must guard pageSettingsTab before tabs.push (#652)');
}
if (preg_match('/^\s*tabs\.push\(accessPermissionsTab\);\s*$/m', $productSrc) === 1) {
$fail('product/update.js must guard accessPermissionsTab before tabs.push (#652)');
}

if (!str_contains($productSrc, 'pageSettingsTab && tabs.push(pageSettingsTab)')) {
$fail('product/update.js missing pageSettingsTab && tabs.push guard');
}
if (!str_contains($productSrc, 'accessPermissionsTab && tabs.push(accessPermissionsTab)')) {
$fail('product/update.js missing accessPermissionsTab && tabs.push guard');
}

$categorySrc = file_get_contents($categoryUpdate);
if ($categorySrc === false) {
$fail('cannot read category/update.js');
}
if (!str_contains($categorySrc, 'accessPermissionsTab && tabs.push(accessPermissionsTab)')) {
$fail('category/update.js lost accessPermissionsTab guard (parity reference)');
}

fwrite(STDOUT, "OK ProductUpdateAccessTabGuardTest\n");
exit(0);