Skip to content

Commit

Permalink
Merge pull request #7 from citrus-framework/fix_response_xhr
Browse files Browse the repository at this point in the history
xhrのレスポンス形式を修正
  • Loading branch information
take64 authored Apr 18, 2020
2 parents a883ee3 + 2cdd63a commit da8c6de
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/Controller/Xhr.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,14 @@ public function run()

$request = Request::generate();

$result = new Response();
$this->initialize($request);
$result->items = $this->$actionName($request);
$response = $this->$actionName($request);
$this->release($request);
$result->messages = Message::callItems();
$response = $result;
$messages = Message::callItems();
if (0 < count($messages))
{
$response->messages = $messages;
}
}
catch (CitrusException $e)
{
Expand Down

0 comments on commit da8c6de

Please sign in to comment.