changes of proposal for and run form

2 files changed, 6 insertions, 4 deletions

diff --git a/src/Form/LabMigrationProposalForm.php b/src/Form/LabMigrationProposalForm.php
index 5c03a1f..27a28f5 100755
--- a/src/Form/LabMigrationProposalForm.php
+++ b/src/Form/LabMigrationProposalForm.php
@@ -22,6 +22,8 @@ use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Mail\MailManager;
 use Drupal\Core\Mail\MailManagerInterface;
 use Drupal\Core\DependencyInjection\ContainerInterface;
+use Drupal\user\Entity\User;
+
 class LabMigrationProposalForm extends FormBase {
 
   /**
@@ -526,7 +528,7 @@ $response = new RedirectResponse(Url::fromRoute('<front>')->toString());
   }
 
   public function submitForm(array &$form, \Drupal\Core\Form\FormStateInterface $form_state) {
-    $user = currentUser();
+    $user = \Drupal::currentUser();
     if (!$user->id()) {
       \Drupal::messenger()->addmessage('It is mandatory to login on this website to access the proposal form');
       return;
@@ -540,7 +542,7 @@ $response = new RedirectResponse(Url::fromRoute('<front>')->toString());
     $solution_provider_university = '';
     $syllabus_copy_file_path = '';
     if ($form_state->getValue(['solution_provider_uid']) == "1") {
-      $solution_provider_uid = $user->get('uid')->value;
+      $solution_provider_uid = $this->currentUser()->id();
       $solution_status = 1;
       $solution_provider_name_title = $form_state->getValue(['name_title']);
       $solution_provider_name = $form_state->getValue(['name']);
@@ -574,7 +576,7 @@ $response = new RedirectResponse(Url::fromRoute('<front>')->toString());
      :approval_date, :solution_date, :solution_provider_name_title, :solution_provider_name,
       :solution_provider_contact_ph, :solution_provider_department, :solution_provider_university, :directory_name,:syllabus_copy_file_path)";
    $args = [
-    'uid' => $user->get('uid')->value,
+    'uid' => $this->currentUser()->id(),
     'approver_uid' => 0,
     'name_title' => $v['name_title'],
     'name' => $v['name'],
diff --git a/src/Form/LabMigrationRunForm.php b/src/Form/LabMigrationRunForm.php
index 67eaf27..1be32ec 100755
--- a/src/Form/LabMigrationRunForm.php
+++ b/src/Form/LabMigrationRunForm.php
@@ -320,7 +320,7 @@ return $form['download_solution_wrapper'];
   }
   
 /*****************************************************/
-public function _list_of_labs($selected)
+public function _list_of_labs()
   {
     $lab_titles = array(
         '0' => 'Please select...'