Merge remote-tracking branch 'upstream/2.5' into 1.3

# Conflicts: # src/lib/Form/Type/FieldType/DateFieldType.php
ezsystems · Mar 9, 2022 · 1b87988 · 1b87988
2 parents 9d904b3 + 8008a86
commit 1b87988
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/pr-assign.yaml b/.github/workflows/pr-assign.yaml
@@ -0,0 +1,10 @@
+name: Assign Pull Request to maintainers
+
+on:
+    pull_request_target:
+
+jobs:
+    assign:
+        uses: ibexa/gh-workflows/.github/workflows/pr-assign.yml@main
+        secrets:
+            robot-token: ${{ secrets.EZROBOT_PAT }}
diff --git a/src/lib/Form/Type/FieldType/DateFieldType.php b/src/lib/Form/Type/FieldType/DateFieldType.php
@@ -21,7 +21,7 @@
  */
 class DateFieldType extends AbstractType
 {
-    private const EDIT_VIEWS = ['ezplatform.content.draft.edit', 'ezplatform.content.translate'];
+    private const EDIT_VIEWS = ['ezplatform.content.draft.edit', 'ezplatform.content.translate', 'ibexa.content.translate_with_location'];
 
     /** @var \Symfony\Component\HttpFoundation\RequestStack */
     private $requestStack;