[FOLLOWUP][TASK] Import/Export (impexp) move to Fluid standalone view 72/45972/2
authorReinhard Führicht <rf@typoheads.at>
Fri, 15 Jan 2016 16:36:37 +0000 (17:36 +0100)
committerMarkus Klein <markus.klein@typo3.org>
Fri, 15 Jan 2016 20:44:29 +0000 (21:44 +0100)
Resolves: #72699
Releases: master, 7.6
Change-Id: I96c351d29af45867864c404b2fa47e03466ed7e9
Reviewed-on: https://review.typo3.org/45972
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Classes/Import.php
typo3/sysext/impexp/Classes/ImportExport.php

index 7329f0e..542e802 100644 (file)
@@ -353,7 +353,7 @@ class ImportExportController extends BaseScriptClass
         $this->export->extensionDependencies = (array)$inData['extension_dep'];
         $this->export->showStaticRelations = $inData['showStaticRelations'];
         $this->export->includeExtFileResources = !$inData['excludeHTMLfileResources'];
-        $this->export->setStandaloneView($this->standaloneView);
+
         // Static tables:
         if (is_array($inData['external_static']['tables'])) {
             $this->export->relStaticTables = $inData['external_static']['tables'];
@@ -543,7 +543,7 @@ class ImportExportController extends BaseScriptClass
         $this->makeConfigurationForm($inData);
 
         $row = array();
-        $this->makeSaveForm($inData, $row);
+        $this->makeSaveForm($inData);
         $this->standaloneView->assign('saveForm', implode('', $row));
 
         $this->makeAdvancedOptionsForm($inData);
@@ -553,7 +553,7 @@ class ImportExportController extends BaseScriptClass
         $this->standaloneView->assign('errors', trim($errors));
 
         // Generate overview:
-        $this->standaloneView->assign('overviewContent', $this->export->displayContentOverview());
+        $this->standaloneView->assign('contentOverview', $this->export->displayContentOverview());
     }
 
     /**
@@ -809,7 +809,6 @@ class ImportExportController extends BaseScriptClass
             $import->showDiff = !$inData['notShowDiff'];
             $import->allowPHPScripts = $inData['allowPHPScripts'];
             $import->softrefInputValues = $inData['softrefInputValues'];
-            $import->setStandaloneView($this->standaloneView);
 
             // OUTPUT creation:
 
@@ -871,7 +870,7 @@ class ImportExportController extends BaseScriptClass
                         }
                     }
                     $import->display_import_pid_record = $this->pageinfo;
-                    $import->displayContentOverview();
+                    $this->standaloneView->assign('contentOverview',  $import->displayContentOverview());
                 }
             }
             // Print errors that might be:
index a1a39a3..b2f5d05 100644 (file)
@@ -29,10 +29,6 @@ use TYPO3\CMS\Core\Utility\StringUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 /**
- *
- */
-
-/**
  * T3D file Import library (TYPO3 Record Document)
  */
 class Import extends ImportExport
@@ -1267,7 +1263,7 @@ class Import extends ImportExport
     public function remapListedDBRecords_flexFormCallBack($pParams, $dsConf, $dataValue, $dataValue_ext1, $dataValue_ext2, $path)
     {
         // Extract parameters:
-        list($table, $uid, $field, $config) = $pParams;
+        list(, , , $config) = $pParams;
         // In case the $path is used as index without a trailing slash we will remove that
         if (!is_array($config['flexFormRels']['db'][$path]) && is_array($config['flexFormRels']['db'][rtrim($path, '/')])) {
             $path = rtrim($path, '/');
index bfab7de..6982d52 100644 (file)
@@ -25,7 +25,6 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\File\ExtendedFileUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
-use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Lang\LanguageService;
 
 /**
@@ -253,11 +252,6 @@ abstract class ImportExport
     protected $iconFactory;
 
     /**
-     * @var StandaloneView
-     */
-    protected $standaloneView = null;
-
-    /**
      * The constructor
      */
     public function __construct()
@@ -287,7 +281,7 @@ abstract class ImportExport
     /**
      * Displays an overview of the header-content.
      *
-     * @return void
+     * @return array The view data
      */
     public function displayContentOverview()
     {
@@ -344,7 +338,7 @@ abstract class ImportExport
             }
         }
 
-        $this->standaloneView->assign('contentOverview', $viewData);
+        return $viewData;
     }
 
     /**
@@ -1237,12 +1231,4 @@ abstract class ImportExport
         return $GLOBALS['LANG'];
     }
 
-    /**
-     * @param StandaloneView $standaloneView The view object
-     * @return void
-     */
-    public function setStandaloneView(StandaloneView $standaloneView)
-    {
-        $this->standaloneView = $standaloneView;
-    }
 }