Skip to content
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

Jump to bottom

BO : Right side block of attribute and attribute groups in combination tab not appears. #10392

Closed
wants to merge 8 commits into from
Closed

BO : Right side block of attribute and attribute groups in combination tab not appears. #10392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4d6d45
BO : Right side block of attribute and attribute groups in combinatio…
dineshbadrukhiya Sep 12, 2018
5106659
Update ProductController.php
dineshbadrukhiya Sep 12, 2018
8bf1094
Update ProductController.php
dineshbadrukhiya Sep 12, 2018
7d72725
Update ProductController.php
dineshbadrukhiya Sep 14, 2018
6c887e5
Update ProductController.php
dineshbadrukhiya Sep 14, 2018
50b38b7
"Design improvements in header of checkout page"
dineshbadrukhiya Sep 20, 2018
bf92cb9
Delete theme.css
dineshbadrukhiya Sep 20, 2018
b29b23d
Revert "Delete theme.css"
dineshbadrukhiya Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/PrestaShopBundle/Controller/Admin/ProductController.php
View file
Open in desktop
Expand Up @@ -543,7 +543,8 @@ public function formAction($id, Request $request)
}

$doctrine = $this->getDoctrine()->getManager();
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop(1, 1);
$language = empty($languages[0]) ? ['id_lang' => 1, 'id_shop' => 1] : $languages[0];
$attributeGroups = $doctrine->getRepository('PrestaShopBundle:Attribute')->findByLangAndShop((int) $language['id_lang'], (int) ['id_shop']);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(int) ['id_shop'] is not and id.


$drawerModules = (new HookFinder())->setHookName('displayProductPageDrawer')
->setParams(['product' => $product])
Expand Down
2 changes: 1 addition & 1 deletion themes/classic/assets/css/theme.css
View file
Open in desktop

Large diffs are not rendered by default.