EZP-29115: Add characters counter to RichText

ezsystems · Jan 24, 2019 · beb0da3 · beb0da3
2 parents fbe42d0 + 6222468
commit beb0da3
Show file tree

Hide file tree

Showing 294 changed files with 5,554 additions and 1,835 deletions.
diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
         "symfony/symfony": "^3.4",
         "jms/translation-bundle": "^1.3.2",
         "ezsystems/ezpublish-kernel": "^7.4@dev",
-        "ezsystems/repository-forms": "^2.3@dev",
-        "ezsystems/ezplatform-admin-ui-modules": "^1.3@dev",
+        "ezsystems/repository-forms": "^2.4@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.4@dev",
         "ezsystems/ez-support-tools": "^0.2@dev",
         "ezsystems/ezplatform-design-engine": "^2.0@dev",
         "white-october/pagerfanta-bundle": "^1.1",
@@ -27,6 +27,7 @@
         "willdurand/js-translation-bundle": "^2.6.6"
     },
     "require-dev": {
+        "behat/behat": "^3.5.0",
         "friendsofphp/php-cs-fixer": "~2.7.1",
         "phpunit/phpunit": "^6.4",
         "matthiasnoback/symfony-dependency-injection-test": "^2.3"
@@ -37,8 +38,8 @@
     "extra": {
         "_ezplatform_branch_for_behat_tests": "master",
         "branch-alias": {
-            "dev-tmp_ci_branch": "2.4.x-dev",
-            "dev-master": "1.4.x-dev"
+            "dev-tmp_ci_branch": "2.5.x-dev",
+            "dev-master": "1.5.x-dev"
         }
     }
 }
diff --git a/src/bundle/Controller/ContentOnTheFlyController.php b/src/bundle/Controller/ContentOnTheFlyController.php
@@ -10,6 +10,7 @@
 use eZ\Publish\API\Repository\Exceptions as ApiException;
 use eZ\Publish\API\Repository\LanguageService;
 use eZ\Publish\API\Repository\LocationService;
+use eZ\Publish\API\Repository\Values\Content\ContentCreateStruct;
 use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\ContentType\ContentType;
 use eZ\Publish\Core\Base\Exceptions\UnauthorizedException;
@@ -118,7 +119,7 @@ public function hasCreateAccessAction(
         $response = new JsonResponse();
 
         try {
-            $contentCreateStruct = $this->contentService->newContentCreateStruct($contentType, $languageCode);
+            $contentCreateStruct = $this->createContentCreateStruct($parentLocation, $contentType, $languageCode);
             $locationCreateStruct = $this->locationService->newLocationCreateStruct($parentLocation->id);
 
             $permissionResolver = $this->container->get('ezpublish.api.repository')->getPermissionResolver();
@@ -159,4 +160,22 @@ public function hasCreateAccessAction(
 
         return $response;
     }
+
+    /**
+     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
+     * @param string $language
+     *
+     * @return \eZ\Publish\API\Repository\Values\Content\ContentCreateStruct
+     */
+    private function createContentCreateStruct(
+        Location $location,
+        ContentType $contentType,
+        string $language
+    ): ContentCreateStruct {
+        $contentCreateStruct = $this->contentService->newContentCreateStruct($contentType, $language);
+        $contentCreateStruct->sectionId = $location->contentInfo->sectionId;
+
+        return $contentCreateStruct;
+    }
 }