Unverified Commit dc10f8ec authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3151360 by quietone, benjifisher, ToneLoc: Improve description for file... 

Issue #3151360 by quietone, benjifisher, ToneLoc: Improve description for file paths on the CredentialFrom

(cherry picked from commit 98057144)
parent e0a0f48b

core/modules/migrate_drupal_ui/src/Form/CredentialForm.php

+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 
    ];

    $form['source']['d6_source_base_path'] = [

      '#type' => 'textfield',

      '#title' => $this->t('Files directory'),

      '#title' => $this->t('Document root for files'),

      '#description' => $this->t('To import files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (for example http://example.com).'),

      '#states' => [

        'visible' => [
@@ -179,7 +179,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 


    $form['source']['source_base_path'] = [

      '#type' => 'textfield',

      '#title' => $this->t('Public files directory'),

      '#title' => $this->t('Document root for public files'),

      '#description' => $this->t('To import public files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (for example http://example.com).'),

      '#states' => [

        'visible' => [
@@ -191,7 +191,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 


    $form['source']['source_private_file_path'] = [

      '#type' => 'textfield',

      '#title' => $this->t('Private files directory'),

      '#title' => $this->t('Document root for private files'),

      '#default_value' => '',

      '#description' => $this->t('To import private files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot).'),

      '#states' => [

core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php

+3 −3
Original line number Diff line number Diff line
@@ -100,11 +100,11 @@ public function testMigrateUpgradeExecute() { 
    }

    $this->drupalPostForm(NULL, $paths + $edits, t('Review upgrade'));

    if ($version == 6) {

      $session->responseContains('Failed to read from Files directory.');

      $session->responseContains('Failed to read from Document root for files.');

    }

    else {

      $session->responseContains('Failed to read from Public files directory.');

      $session->responseContains('Failed to read from Private files directory.');

      $session->responseContains('Failed to read from Document root for public files.');

      $session->responseContains('Failed to read from Document root for private files.');

    }



    // Restart the upgrade process.