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

Merge fixes to master #77

Merged
merged 5 commits into from
Dec 14, 2018
Merged

Merge fixes to master #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ecb7a9
Fix read more modal
MrBaiame Dec 5, 2018
641e9a0
Fix title issue
MrBaiame Dec 5, 2018
8b3a452
Fix #69
MrBaiame Dec 5, 2018
8e15e79
Fix #75
MrBaiame Dec 11, 2018
a8b6e7f
Merge pull request #76 from PrestaShop/character_issue
MrBaiame Dec 14, 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
7 changes: 6 additions & 1 deletion controllers/admin/AdminPsMboModuleController.php
View file
Open in desktop
Expand Up @@ -163,6 +163,10 @@ public function displayAjaxGetModulesList()

$categories = $container->get('prestashop.categories_provider')->getCategoriesMenu($modules);

foreach ($categories['categories']->subMenu as &$category) {
$category->name = html_entity_decode($this->trans($category->name, array(), 'Admin.Modules.Feature'));
}

// In newest versions of PrestaShop, a AddonsCollection can be returned.
// We check that we deal with an array, as the class may not exist.
if (!is_array($modules)) {
Expand All @@ -172,6 +176,7 @@ public function displayAjaxGetModulesList()

$modules = $this->getPresentedProducts($modules);
foreach ($modules as $key => &$module) {
$module['attributes']['displayName'] = html_entity_decode($module['attributes']['displayName']);
$module['attributes']['description'] = html_entity_decode($module['attributes']['description']);
$module['attributes']['description'] = htmlspecialchars_decode(
$module['attributes']['description'],
Expand Down Expand Up @@ -216,7 +221,7 @@ private function getPresentedProducts(array &$modules)
return $presentedProducts;
}

public function displayAjaxGetModuleQuickView()
public function displayAjaxGetMboModuleQuickView()
{
$modules = Module::getModulesOnDisk();

Expand Down
2 changes: 1 addition & 1 deletion views/js/controllers/module/module.js
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ $(document).ready(function() {
},
methods: {
getHref: function(module_name) {
return window.vApp.admin_module_ajax_url_psmbo + '&action=GetModuleQuickView&module_name=' + module_name + '&ajax=1';
return window.vApp.admin_module_ajax_url_psmbo + '&action=GetMboModuleQuickView&module_name=' + module_name + '&ajax=1';
},
getAvgRateClass: function(avg_rate) {
return 'module-stars module-star-ranking-grid-' + Math.round(avg_rate) + ' small';
Expand Down