Skip to content

GitLab

Commit 1913c9d2 authored by Χάρης Παπαδόπουλος's avatar Χάρης Παπαδόπουλος
Browse files

Merge branch 'edge' into 'develop' 

Removed buggy code(undefined variables)

See merge request !232
parents 6b248da5 ac6ce47e
Show whitespace changes
Inline Side-by-side
drupal/modules/epal/src/Controller/DirectorView.php
View file @ 1913c9d2
...@@ -81,7 +81,6 @@ class DirectorView extends ControllerBase ...@@ -81,7 +81,6 @@ class DirectorView extends ControllerBase
'error_code' => 4003, 'error_code' => 4003,
], Response::HTTP_FORBIDDEN); ], Response::HTTP_FORBIDDEN);
} elseif ($userRole === 'epal') { } elseif ($userRole === 'epal') {
$selectIdNew = $selectId;
if ($classId == 1) { if ($classId == 1) {
$selectIdNew = -1; $selectIdNew = -1;
} elseif ($classId == 2) { } elseif ($classId == 2) {
......
drupal/modules/epal/src/Controller/SubmitedApplications.php
View file @ 1913c9d2
...@@ -259,9 +259,9 @@ class SubmitedApplications extends ControllerBase ...@@ -259,9 +259,9 @@ class SubmitedApplications extends ControllerBase
'name' => $name_decoded, 'name' => $name_decoded,
'studentsurname' => $studentsurname_decoded, 'studentsurname' => $studentsurname_decoded,
'fatherfirstname' => $fatherfirstname_decoded, 'fatherfirstname' => $fatherfirstname_decoded,
'fathersurname' => $object->fathersurname->value, 'fathersurname' => '',
'motherfirstname' => $motherfirstname_decoded, 'motherfirstname' => $motherfirstname_decoded,
'mothersurname' => $object->mothersurname->value, 'mothersurname' => '',
'guardian_name' => $guardian_name_decoded, 'guardian_name' => $guardian_name_decoded,
'guardian_surname' => $guardian_surname_decoded, 'guardian_surname' => $guardian_surname_decoded,
'guardian_fathername' => $guardian_fathername_decoded, 'guardian_fathername' => $guardian_fathername_decoded,
...@@ -436,9 +436,9 @@ class SubmitedApplications extends ControllerBase ...@@ -436,9 +436,9 @@ class SubmitedApplications extends ControllerBase
'name' => $name_decoded, 'name' => $name_decoded,
'studentsurname' => $studentsurname_decoded, 'studentsurname' => $studentsurname_decoded,
'fatherfirstname' => $fatherfirstname_decoded, 'fatherfirstname' => $fatherfirstname_decoded,
'fathersurname' => $epalStudent->fathersurname, 'fathersurname' => '',
'motherfirstname' => $motherfirstname_decoded, 'motherfirstname' => $motherfirstname_decoded,
'mothersurname' => $epalStudent->mothersurname, 'mothersurname' => '',
'guardian_name' => $guardian_name_decoded, 'guardian_name' => $guardian_name_decoded,
'guardian_surname' => $guardian_surname_decoded, 'guardian_surname' => $guardian_surname_decoded,
'guardian_fathername' => $guardian_fathername_decoded, 'guardian_fathername' => $guardian_fathername_decoded,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment