diff --git a/.github/workflows/cla-check.yaml b/.github/workflows/cla-check.yaml new file mode 100644 index 00000000..d56f7ff2 --- /dev/null +++ b/.github/workflows/cla-check.yaml @@ -0,0 +1,12 @@ +name: CLA check +on: + issue_comment: + types: [created] + pull_request_target: + types: [opened, closed, synchronize] +jobs: + cla-workflow: + uses: pimcore/workflows-collection-public/.github/workflows/reusable-cla-check.yaml@v1.3.0 + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + secrets: + CLA_ACTION_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }} diff --git a/.github/workflows/poeditor-export.yml b/.github/workflows/poeditor-export.yml new file mode 100644 index 00000000..ef756b61 --- /dev/null +++ b/.github/workflows/poeditor-export.yml @@ -0,0 +1,22 @@ +name: "Trigger POEditor Translations Export" + +on: + workflow_dispatch: + push: + branches: + - "[0-9]+.x" + paths: + - 'src/Resources/translations/admin.en.yml' + +permissions: + contents: read + +jobs: + poeditor: + runs-on: ubuntu-latest + steps: + - name: Trigger workflow in pimcore/poeditor-export-action + env: + GH_TOKEN: ${{ secrets.POEDITOR_ACTION_TRIGGER_TOKEN }} + run: | + gh workflow run -R pimcore/poeditor-export-action poeditor-export.yaml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000..553c3b57 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,10 @@ +name: Handle stale issues + +on: + workflow_dispatch: + schedule: + - cron: '37 7 * * *' + +jobs: + call-stale-workflow: + uses: pimcore/workflows-collection-public/.github/workflows/stale.yml@v1.1.0 diff --git a/src/CustomerSaveManager/DefaultCustomerSaveManager.php b/src/CustomerSaveManager/DefaultCustomerSaveManager.php index 126603dc..687888a8 100644 --- a/src/CustomerSaveManager/DefaultCustomerSaveManager.php +++ b/src/CustomerSaveManager/DefaultCustomerSaveManager.php @@ -128,7 +128,7 @@ protected function rememberOriginalCustomer(CustomerInterface $customer) $originalCustomer = null; } - if ($originalCustomerNeeded) { + if ($originalCustomerNeeded && $customer->getId()) { $originalCustomer = $this->customerProvider->getById($customer->getId(), true); } diff --git a/src/View/Formatter/DefaultViewFormatter.php b/src/View/Formatter/DefaultViewFormatter.php index 355f3075..ca58b77a 100644 --- a/src/View/Formatter/DefaultViewFormatter.php +++ b/src/View/Formatter/DefaultViewFormatter.php @@ -148,10 +148,10 @@ public function formatDatetimeValue($value, $dateOnly = false) $date = Carbon::parse($value); if ($dateOnly) { - return $date->formatLocalized('%x'); + return $date->isoFormat('LL'); } - return $date->formatLocalized('%x %X'); + return $date->isoFormat('LLL'); } /**