v8.6.1

KevinCudennec · Mar 4, 2020 · bc626a1 · bc626a1
1 parent 9780f20
commit bc626a1
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 38 deletions.
diff --git a/public/admin/css/chunk-419d9f22.4e3aae39.css b/public/admin/css/chunk-419d9f22.4e3aae39.css
diff --git a/public/admin/css/chunk-4c980508.3f0b434e.css b/public/admin/css/chunk-4c980508.3f0b434e.css
diff --git a/public/admin/index.html b/public/admin/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=favicon.ico><link rel=manifest href=manifest.webmanifest><title>Directus</title><link rel=stylesheet href=style.css><link href=css/app.f06de946.css rel=preload as=style><link href=js/app.ee2edb24.js rel=preload as=script><link href=js/chunk-vendors.619f7150.js rel=preload as=script><link href=css/app.f06de946.css rel=stylesheet></head><body><noscript><strong>We're sorry but Directus doesn't work without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=script.js></script><script src=js/chunk-vendors.619f7150.js></script><script src=js/app.ee2edb24.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=favicon.ico><link rel=manifest href=manifest.webmanifest><title>Directus</title><link rel=stylesheet href=style.css><link href=css/app.f06de946.css rel=preload as=style><link href=js/app.9437a06a.js rel=preload as=script><link href=js/chunk-vendors.619f7150.js rel=preload as=script><link href=css/app.f06de946.css rel=stylesheet></head><body><noscript><strong>We're sorry but Directus doesn't work without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=script.js></script><script src=js/chunk-vendors.619f7150.js></script><script src=js/app.9437a06a.js></script></body></html>
diff --git a/public/admin/js/app.ee2edb24.js → public/admin/js/app.9437a06a.js b/public/admin/js/app.ee2edb24.js → public/admin/js/app.9437a06a.js
diff --git a/public/admin/js/app.ee2edb24.js.map → public/admin/js/app.9437a06a.js.map b/public/admin/js/app.ee2edb24.js.map → public/admin/js/app.9437a06a.js.map
diff --git a/public/admin/js/chunk-419d9f22.2974834f.js b/public/admin/js/chunk-419d9f22.2974834f.js
diff --git a/public/admin/js/chunk-419d9f22.2974834f.js.map b/public/admin/js/chunk-419d9f22.2974834f.js.map
diff --git a/public/admin/js/chunk-4c980508.5d6ddb9b.js b/public/admin/js/chunk-4c980508.5d6ddb9b.js
diff --git a/public/admin/js/chunk-4c980508.5d6ddb9b.js.map b/public/admin/js/chunk-4c980508.5d6ddb9b.js.map
diff --git a/src/core/Directus/Application/Application.php b/src/core/Directus/Application/Application.php
@@ -13,7 +13,7 @@ class Application extends App
      *
      * @var string
      */
-    const DIRECTUS_VERSION = '8.6.0';
+    const DIRECTUS_VERSION = '8.6.1';
 
     /**
      * NOT USED

diff --git a/src/core/Directus/GraphQL/FieldsConfig.php b/src/core/Directus/GraphQL/FieldsConfig.php
@@ -77,20 +77,6 @@ public function getFields()
                     $fields[$v['field']] = Types::userCollection($collection);
                     break;
                 case 'o2m':
-                    $relation = $this->getRelation('o2m', $v['collection'], $v['field']);
-                    if ($v['interface'] == 'one-to-many') {
-                        $fields[$v['field']] = Types::listOf(Types::userCollection($relation['collection_many']));
-                    } else {
-                        $fields[$v['field']] = [];
-                        $fields[$v['field']]['type'] = Types::listOf(Types::userCollection($relation['collection_one']));
-                        $fields[$v['field']]['resolve'] = function ($value, $args, $context, $info) use ($relation) {
-                            $data = [];
-                            foreach ($value[$info->fieldName] as $v) {
-                                $data[] = $v[$relation['field_many']];
-                            }
-                            return $data;
-                        };
-                    }
                 case 'translation': // translation is just an o2m collection
                     $collection = $this->getOtherCollectionOneToMany(
                         $v['collection'], $v['field']);
@@ -206,8 +192,8 @@ public function getFilters()
                     break;
 
                 default:
-                    $filters[$v['field'] . '_all'] = Types::nonNull(Types::string());
-                    $filters[$v['field'] . '_has'] = Types::nonNull(Types::string());
+                    $filters[$v['field'] . '_all'] = Types::string();
+                    $filters[$v['field'] . '_has'] = Types::string();
             }
         }
         $filters['or'] = Types::listOf(Types::filters($this->collection));

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit8a6421c7b47a4d2883b23f0121a83dc9::getLoader();
+return ComposerAutoloaderInit3c9f09c5490156f69b82cc06921912f8::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit8a6421c7b47a4d2883b23f0121a83dc9
+class ComposerAutoloaderInit3c9f09c5490156f69b82cc06921912f8
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit8a6421c7b47a4d2883b23f0121a83dc9', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit3c9f09c5490156f69b82cc06921912f8', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit8a6421c7b47a4d2883b23f0121a83dc9', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit3c9f09c5490156f69b82cc06921912f8', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit3c9f09c5490156f69b82cc06921912f8::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -39,19 +39,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit3c9f09c5490156f69b82cc06921912f8::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire8a6421c7b47a4d2883b23f0121a83dc9($fileIdentifier, $file);
+            composerRequire3c9f09c5490156f69b82cc06921912f8($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire8a6421c7b47a4d2883b23f0121a83dc9($fileIdentifier, $file)
+function composerRequire3c9f09c5490156f69b82cc06921912f8($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9
+class ComposerStaticInit3c9f09c5490156f69b82cc06921912f8
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -2548,10 +2548,10 @@ class ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit8a6421c7b47a4d2883b23f0121a83dc9::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit3c9f09c5490156f69b82cc06921912f8::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit3c9f09c5490156f69b82cc06921912f8::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit3c9f09c5490156f69b82cc06921912f8::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit3c9f09c5490156f69b82cc06921912f8::$classMap;
 
         }, null, ClassLoader::class);
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=favicon.ico><link rel=manifest href=manifest.webmanifest><title>Directus</title><link rel=stylesheet href=style.css><link href=css/app.f06de946.css rel=preload as=style><link href=js/app.ee2edb24.js rel=preload as=script><link href=js/chunk-vendors.619f7150.js rel=preload as=script><link href=css/app.f06de946.css rel=stylesheet></head><body><noscript><strong>We're sorry but Directus doesn't work without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=script.js></script><script src=js/chunk-vendors.619f7150.js></script><script src=js/app.ee2edb24.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=favicon.ico><link rel=manifest href=manifest.webmanifest><title>Directus</title><link rel=stylesheet href=style.css><link href=css/app.f06de946.css rel=preload as=style><link href=js/app.9437a06a.js rel=preload as=script><link href=js/chunk-vendors.619f7150.js rel=preload as=script><link href=css/app.f06de946.css rel=stylesheet></head><body><noscript><strong>We're sorry but Directus doesn't work without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=script.js></script><script src=js/chunk-vendors.619f7150.js></script><script src=js/app.9437a06a.js></script></body></html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		require_once __DIR__ . '/composer/autoload_real.php';

		return ComposerAutoloaderInit8a6421c7b47a4d2883b23f0121a83dc9::getLoader();
		return ComposerAutoloaderInit3c9f09c5490156f69b82cc06921912f8::getLoader();