miguel456
/
rbrecruiter
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases 2 Wiki Activity

WIP: Road to 1.0.0 #1

Draft
miguel456 wants to merge 123 commits from develop into master
pull from: develop
merge into: miguel456:master
Conversation 1 Commits 123 Files Changed 586 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f83b3a6860 - Show all commits

14
app/Http/Controllers/ApplicationController.php
View File

@ -39,13 +39,13 @@ class ApplicationController extends Controller
private function processOSLinebreaks(array $structuredResponses) private function processOSLinebreaks(array $structuredResponses)
{ {
$processedResponses = $structuredResponses; $processedResponses = $structuredResponses;
foreach ($structuredResponses as $field)
foreach ($structuredResponses as $responseKey => $response)
{ {
// We can't use nl2br because it preserves the line breaks and doesn't include all line breaks used by other operating systems foreach($field as $fieldKey => $fieldData)
$originalResponse = $response['response']; {
$processedResponses[$responseKey]['response'] = str_replace(["\r\n", "\r", "\n"], "<br/>", $originalResponse); $originalResponse = $fieldData['response'];
} $processedResponses['responses'][$fieldKey]['response'] = str_replace(["\r\n", "\r", "\n"], "<br/>", $$ }
// We can't use nl2br because it preserves the line breaks and doesn't include all line breaks used by othe$ }
return $processedResponses; return $processedResponses;
} }
@ -79,7 +79,7 @@ class ApplicationController extends Controller
[ [
'application' => $application, 'application' => $application,
'comments' => $application->comments, 'comments' => $application->comments,
'structuredResponses' => json_decode($application->response->responseData, true), 'structuredResponses' => $this->processOSLinebreaks(json_decode($application->response->responseData, true)),
'formStructure' => $application->response->form, 'formStructure' => $application->response->form,
'vacancy' => $application->response->vacancy, 'vacancy' => $application->response->vacancy,
'canVote' => $this->canVote($application->votes), 'canVote' => $this->canVote($application->votes),