Skip to content
Snippets Groups Projects
Verified Commit 1b93f19f authored by Damien's avatar Damien
Browse files

FEAT #9105 History with basket name

parent 03d9496b
No related branches found
No related tags found
No related merge requests found
......@@ -25,9 +25,10 @@ class ActionMethodController
public static function terminateAction(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['id', 'resources']);
ValidatorModel::notEmpty($aArgs, ['id', 'resources', 'basketName']);
ValidatorModel::intVal($aArgs, ['id']);
ValidatorModel::arrayType($aArgs, ['resources']);
ValidatorModel::stringType($aArgs, ['basketName']);
$set = ['locker_user_id' => null, 'locker_time' => null, 'modification_date' => 'CURRENT_TIMESTAMP'];
......@@ -49,7 +50,7 @@ class ActionMethodController
'recordId' => $resource,
'eventType' => 'ACTION#' . $resource,
'eventId' => $aArgs['id'],
'info' => $action['label_action']
'info' => "{$aArgs['basketName']} : {$action['label_action']}"
]);
//TODO M2M
......
......@@ -571,7 +571,7 @@ class ResourceListController
return $response->withStatus($errors['code'])->withJson(['errors' => $errors['errors']]);
}
$basket = BasketModel::getById(['id' => $aArgs['basketId'], 'select' => ['basket_clause', 'basket_id']]);
$basket = BasketModel::getById(['id' => $aArgs['basketId'], 'select' => ['basket_clause', 'basket_id', 'basket_name']]);
$group = GroupModel::getById(['id' => $aArgs['groupId'], 'select' => ['group_id']]);
$actionGroupBasket = ActionGroupBasketModel::get([
'select' => [1],
......@@ -630,7 +630,7 @@ class ResourceListController
ActionMethodController::$method(['id' => $aArgs['actionId'], 'resId' => $resId]);
}
}
ActionMethodController::terminateAction(['id' => $aArgs['actionId'], 'resources' => $body['resources']]);
ActionMethodController::terminateAction(['id' => $aArgs['actionId'], 'resources' => $body['resources'], 'basketName' => $basket['basket_name']]);
return $response->withStatus(204);
}
......
......@@ -80,7 +80,6 @@ class ActionsControllerTest extends TestCase
$this->assertSame('index_mlb', $responseBody->action->action_page);
$this->assertSame(true, $responseBody->action->history);
$this->assertSame('apps', $responseBody->action->origin);
$this->assertSame(false, $responseBody->action->create_id);
// FAIL READ
$actionController = new \Action\controllers\ActionController();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment