Merge remote-tracking branch 'origin/1.7' into 2.1

Author: kingjia90

public/css/icons.css

@@ -1021,6 +1021,10 @@
     background: url(/bundles/pimcoreadmin/img/flat-color-icons/cell_phone_landscape.svg) center center no-repeat !important;
 }
 
+.pimcore_icon_systemrequirements {
+    background: url(/bundles/pimcoreadmin/img/flat-color-icons/factory.svg) center center no-repeat !important;
+}
+
 .pimcore_icon_notes {
     background: url(/bundles/pimcoreadmin/img/flat-color-icons/survey.svg) center center no-repeat !important;
 }

src/Controller/Admin/Document/LinkController.php

@@ -116,25 +116,24 @@ protected function setValuesToDocument(Request $request, Document $document): vo
 
                 if (!$target) {
                     if ($target = Document::getByPath($path)) {
-                        $data['linktype'] = 'internal';
                         $data['internalType'] = 'document';
                         $data['internal'] = $target->getId();
                     } elseif ($target = Asset::getByPath($path)) {
-                        $data['linktype'] = 'internal';
                         $data['internalType'] = 'asset';
                         $data['internal'] = $target->getId();
                     } elseif ($target = Concrete::getByPath($path)) {
-                        $data['linktype'] = 'internal';
                         $data['internalType'] = 'object';
                         $data['internal'] = $target->getId();
                     } else {
                         $data['linktype'] = 'direct';
                         $data['internalType'] = null;
+                        $data['internal'] = null;
                         $data['direct'] = $path;
                     }
 
                     if ($target) {
                         $data['linktype'] = 'internal';
+                        $data['direct'] = '';
                     }
                 }
             } else {

src/Service/GridData/DataObject.php

@@ -169,6 +169,11 @@ public static function getData(AbstractObject $object, ?array $fields = null, ?s
                                     ) {
                                         $data[$dataKey . '%options'] = $def->getOptions();
                                     }
+
+                                    // to prevent malforded grids in case of empty fieldcollections
+                                    if ($def instanceof ClassDefinition\Data\Fieldcollections) {
+                                        $data[$dataKey] ??= '';
+                                    }
                                 }
                             } else {
                                 $data[$dataKey] = $valueObject->value;
@@ -351,7 +356,16 @@ protected static function getInheritedData(Concrete $object, string $key, string
         }
 
         $inheritedValue = self::getStoreValueForObject($parent, $key, $requestedLanguage);
-        if ((!is_array($inheritedValue) && $inheritedValue !== null) || !empty($inheritedValue['value'])) {
+        if (
+            (!is_array($inheritedValue) && $inheritedValue !== null) ||
+            (
+                is_array($inheritedValue) &&
+                (
+                    array_is_list($inheritedValue) || //for table field types
+                    !empty($inheritedValue['value'] ?? null)
+                )
+            )
+        ) {
             return [
                 'parent' => $parent,
                 'value' => $inheritedValue,