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

Use empty legacy action parameter #15658

Merged
merged 2 commits into from Sep 26, 2019
Merged

Use empty legacy action parameter #15658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c6700a
Use empty legacy action parameter
jolelievre Sep 23, 2019
1b8ee84
Allow automatic action to be overridden by parameters
jolelievre Sep 23, 2019
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
12 changes: 9 additions & 3 deletions src/Adapter/Routing/LegacyHelperLinkBuilder.php
View file
Open in desktop
Expand Up @@ -86,10 +86,16 @@ public function getEditLink($entity, array $parameters)
private function buildActionParameters($action, $entity, array $parameters)
{
unset($parameters['current_index']);
$viewAction = $action . $entity;
$actionParameter = $action . $entity;

/**
* Legacy actions are displayed with empty value (e.g ?controller=ProductAdminController&updateproduct&id_product=1)
* Some modules don't just check that the parameter is set but also that it is empty...
* The closest thing we have with http_build_query is controller=ProductAdminController&updateproduct=&id_product=1
*/
$parameters = array_merge(
$parameters,
[$viewAction => 1]
[$actionParameter => ''],
$parameters
);

return $parameters;
Expand Down
14 changes: 10 additions & 4 deletions tests/Unit/Adapter/Routing/LegacyHelperLinkBuilderTest.php
View file
Open in desktop
Expand Up @@ -35,20 +35,26 @@ public function testBuildViewLink()
{
$builder = new LegacyHelperLinkBuilder();
$viewLink = $builder->getViewLink('product', ['id_product' => 42, 'current_index' => 'index.php?controller=AdminProducts']);
$this->assertEquals('index.php?controller=AdminProducts&id_product=42&viewproduct=1', $viewLink);
$this->assertEquals('index.php?controller=AdminProducts&viewproduct=&id_product=42', $viewLink);

$viewLink = $builder->getViewLink('product', ['id_product' => 42, 'current_index' => 'index.php?controller=AdminProducts', 'token' => 'toto']);
$this->assertEquals('index.php?controller=AdminProducts&id_product=42&token=toto&viewproduct=1', $viewLink);
$this->assertEquals('index.php?controller=AdminProducts&viewproduct=&id_product=42&token=toto', $viewLink);

$viewLink = $builder->getViewLink('product', ['id_product' => 42, 'current_index' => 'index.php?controller=AdminProducts', 'viewproduct' => 'on']);
$this->assertEquals('index.php?controller=AdminProducts&viewproduct=on&id_product=42', $viewLink);
}

public function testBuildEditLink()
{
$builder = new LegacyHelperLinkBuilder();
$editLink = $builder->getEditLink('product', ['id_product' => 42, 'current_index' => 'index.php?controller=AdminProducts']);
$this->assertEquals('index.php?controller=AdminProducts&id_product=42&updateproduct=1', $editLink);
$this->assertEquals('index.php?controller=AdminProducts&updateproduct=&id_product=42', $editLink);

$editLink = $builder->getEditLink('product', ['id_product' => 42, 'current_index' => 'index.php?controller=AdminProducts', 'token' => 'toto']);
$this->assertEquals('index.php?controller=AdminProducts&id_product=42&token=toto&updateproduct=1', $editLink);
$this->assertEquals('index.php?controller=AdminProducts&updateproduct=&id_product=42&token=toto', $editLink);

$viewLink = $builder->getEditLink('product', ['id_product' => 42, 'current_index' => 'index.php?controller=AdminProducts', 'updateproduct' => 'enabled']);
$this->assertEquals('index.php?controller=AdminProducts&updateproduct=enabled&id_product=42', $viewLink);
}

/**
Expand Down