Merge branch 'release/2020.07-02'

This commit is contained in:
Björn Fromme
2020-07-14 17:38:59 +02:00
3 changed files with 20 additions and 6 deletions
Generated
+9 -5
View File
@@ -3584,16 +3584,16 @@
},
{
"name": "symfony/polyfill-php72",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "f048e612a3905f34931127360bdd2def19a5e582"
"reference": "3d9c70ff1b9f6bb618f9954b2f7f760220c2b38a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
"reference": "f048e612a3905f34931127360bdd2def19a5e582",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/3d9c70ff1b9f6bb618f9954b2f7f760220c2b38a",
"reference": "3d9c70ff1b9f6bb618f9954b2f7f760220c2b38a",
"shasum": ""
},
"require": {
@@ -3603,6 +3603,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -3649,7 +3653,7 @@
"type": "tidelift"
}
],
"time": "2020-05-12T16:47:27+00:00"
"time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-php73",
@@ -91,7 +91,14 @@ class BackendController extends ActionController
}
public function indexAction()
{}
{
$updatedTimestampPath = GeneralUtility::getFileAbsFileName('fileadmin/xmlexport/.lastupdate');
if ($updatedTimestampPath && file_exists($updatedTimestampPath)) {
$updatedTimestamp = file_get_contents($updatedTimestampPath);
}
$this->view->assign('updatedTimestamp', $updatedTimestamp);
}
public function importProductsAction()
{
@@ -7,6 +7,9 @@
<f:section name="Main">
<h1>E&amp;P Funktionen</h1>
<f:flashMessages />
<p>
<strong>Letzter XML Abruf aus BusPro: {f:if(condition: updatedTimestamp, then: updatedTimestamp, else: '-')}</strong>
</p>
<p>
<f:link.action action="importProducts" class="btn btn-default">
<core:icon identifier="actions-refresh"/>