Skip to content
Snippets Groups Projects
Commit 2af2bacf authored by Tim Wagner's avatar Tim Wagner
Browse files

Merge branch 'f_manual_sorting' into 'master' 

[TASK] Disable manual sorting and add small notification

See merge request !19
parents b7b912f6 f49f020d
No related branches found
No related tags found
1 merge request!19[TASK] Disable manual sorting and add small notification
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 32 deletions
Classes/Controller/BackendController.php
+ 9
− 1
View file @ 2af2bacf
......@@ -128,15 +128,23 @@ class BackendController extends ActionController {
$sortingData = [];
if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['sg_jobs']['allowManualSorting'] && count($filters) <= 0) {
/**
*
* Somehow the pId is changed so data gets lost.
*
$previousUid = 0;
$sortingData = [];
foreach ($jobs as $job) {
if ($previousUid) {
$sortingData['prev'][$job->getUid()] = $previousUid;
$sortingData['next'][$previousUid] = '-' . $job->getUid();
$sortingData['next'][$previousUid] = $job->getUid();
}
$previousUid = $job->getUid();
}
*/
$this->view->assign('manualSortingDestroysEverything', true);
}
......
Configuration/TCA/tx_sgjobs_domain_model_job.php
+ 6
− 8
View file @ 2af2bacf
......@@ -26,7 +26,7 @@
return call_user_func(
function ($extKey, $table) {
$tca = [
return [
'ctrl' => [
'title' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:' . $table . '',
'label' => 'title',
......@@ -76,6 +76,11 @@ return call_user_func(
'palette_apply_function' => ['showitem' => 'hide_apply_by_email, hide_apply_by_postal, featured_offer', 'canNotCollapse' => 1]
],
'columns' => [
'sorting' => [
'config' => [
'type' => 'passthrough'
]
],
'crdate' => [
'exclude' => FALSE,
'config' => [
......@@ -322,13 +327,6 @@ return call_user_func(
]
],
];
if (!$GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['sg_jobs']['allowManualSorting']) {
$tca['columns']['sorting']['config']['type'] = 'passthrough';
}
return $tca;
}, 'sg_jobs', 'tx_sgjobs_domain_model_job'
);
Resources/Private/Backend/Partials/JobList.html
+ 5
− 0
View file @ 2af2bacf
......@@ -3,6 +3,11 @@
<p>
<f:translate key="backend.message.sorting" />
</p>
<f:if condition="{manualSortingDestroysEverything}">
<h2><f:translate key="backend.manualSortingBug" /></h2>
</f:if>
<div class="panel panel-default recordlist">
<div class="table-fit">
<table data-table="tx_sgjobs_domain_model_job" class="table table-striped table-hover">
......
Resources/Private/Backend/Templates/Index.html
+ 1
− 1
View file @ 2af2bacf
......@@ -35,7 +35,7 @@
<f:render partial="CreateJob" arguments="{pageUid:pageUid}" />
<f:if condition="{jobs}">
<f:then>
<f:render partial="JobList" arguments="{jobs: jobs}" />
<f:render partial="JobList" arguments="{jobs: jobs, manualSortingDestroysEverything: manualSortingDestroysEverything}" />
</f:then>
<f:else>
<p>
......
Resources/Private/Language/de.locallang.xlf
+ 11
− 7
View file @ 2af2bacf
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<xliff version="1.0">
<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-05-11T01:54:37Z">
<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2019-08-06T13:15:41Z">
<header>
<type>module</type>
<description>General language labels used in frontend and backend.</description>
......@@ -122,6 +122,10 @@
<source><![CDATA[Item]]></source>
<target><![CDATA[Eintrag]]></target>
</trans-unit>
<trans-unit id="backend.manualSortingBug" approved="yes">
<source><![CDATA[Manual sorting is currently not working. You can do that in the List module.]]></source>
<target><![CDATA[Die manuelle Sortierung ist derzeit leider fehlerbehaftet. Sie können die Reihenfolge in dem Listen-Modul ändern.]]></target>
</trans-unit>
<trans-unit id="backend.message.error" approved="yes">
<source><![CDATA[Something went wrong. Please reload.]]></source>
<target><![CDATA[Etwas ist schiefgelaufen. Bitte laden Sie die Seite neu.]]></target>
......@@ -314,10 +318,6 @@
<source><![CDATA[Entry date]]></source>
<target><![CDATA[Eintrittsdatum]]></target>
</trans-unit>
<trans-unit id="frontend.filter.departments" approved="yes">
<source><![CDATA[Department]]></source>
<target><![CDATA[Bereich]]></target>
</trans-unit>
<trans-unit id="frontend.filter.companies" approved="yes">
<source><![CDATA[Company]]></source>
<target><![CDATA[Unternehmen]]></target>
......@@ -330,6 +330,10 @@
<source><![CDATA[Function]]></source>
<target><![CDATA[Funktion]]></target>
</trans-unit>
<trans-unit id="frontend.filter.departments" approved="yes">
<source><![CDATA[Departments]]></source>
<target><![CDATA[Bereich]]></target>
</trans-unit>
<trans-unit id="frontend.filter.functions" approved="yes">
<source><![CDATA[Function]]></source>
<target><![CDATA[Funktion]]></target>
......@@ -338,7 +342,7 @@
<source><![CDATA[Location]]></source>
<target><![CDATA[Standort]]></target>
</trans-unit>
<trans-unit id="frontend.filter.submit">
<trans-unit id="frontend.filter.submit" approved="yes">
<source><![CDATA[Filter]]></source>
<target><![CDATA[Filtern]]></target>
</trans-unit>
......@@ -376,4 +380,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
\ No newline at end of file
Resources/Private/Language/de.locallang_db.xlf
+ 2
− 2
View file @ 2af2bacf
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<xliff version="1.0">
<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2019-07-04T13:01:42Z">
<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2019-08-06T13:19:35Z">
<header>
<type>database</type>
<description>General language labels used in frontend and backend.</description>
......@@ -371,4 +371,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
\ No newline at end of file
Resources/Private/Language/locallang.xlf
+ 8
− 5
View file @ 2af2bacf
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<xliff version="1.0">
<file source-language="en" datatype="plaintext" original="messages" date="2016-05-11T01:54:37Z">
<file source-language="en" datatype="plaintext" original="messages" date="2019-08-06T13:15:41Z">
<header>
<type>module</type>
<description>General language labels used in frontend and backend.</description>
......@@ -93,6 +93,9 @@
<trans-unit id="backend.list.item">
<source><![CDATA[Item]]></source>
</trans-unit>
<trans-unit id="backend.manualSortingBug">
<source><![CDATA[Manual sorting is currently not working. You can do that in the List module.]]></source>
</trans-unit>
<trans-unit id="backend.message.error">
<source><![CDATA[Something went wrong. Please reload.]]></source>
</trans-unit>
......@@ -237,9 +240,6 @@
<trans-unit id="frontend.entry_date">
<source><![CDATA[Entry date]]></source>
</trans-unit>
<trans-unit id="frontend.filter.departments">
<source><![CDATA[Departments]]></source>
</trans-unit>
<trans-unit id="frontend.filter.companies">
<source><![CDATA[Company]]></source>
</trans-unit>
......@@ -249,6 +249,9 @@
<trans-unit id="frontend.filter.countriesfunctions">
<source><![CDATA[Function]]></source>
</trans-unit>
<trans-unit id="frontend.filter.departments">
<source><![CDATA[Departments]]></source>
</trans-unit>
<trans-unit id="frontend.filter.functions">
<source><![CDATA[Function]]></source>
</trans-unit>
......@@ -284,4 +287,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
\ No newline at end of file
Resources/Private/Language/locallang_db.xlf
+ 2
− 2
View file @ 2af2bacf
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<xliff version="1.0">
<file source-language="en" datatype="plaintext" original="messages" date="2019-07-04T13:01:42Z">
<file source-language="en" datatype="plaintext" original="messages" date="2019-08-06T13:19:35Z">
<header>
<type>database</type>
<description>General language labels used in frontend and backend.</description>
......@@ -284,4 +284,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
\ No newline at end of file
Resources/Private/Language/zh.locallang.xlf
+ 6
− 6
View file @ 2af2bacf
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<xliff version="1.0">
<file source-language="en" target-language="zh" datatype="plaintext" original="messages" date="2016-05-11T01:54:37Z">
<file source-language="en" target-language="zh" datatype="plaintext" original="messages" date="2019-08-06T13:15:41Z">
<header>
<type>module</type>
<description>General language labels used in frontend and backend.</description>
......@@ -193,10 +193,6 @@
<source><![CDATA[Entry date]]></source>
<target><![CDATA[入境时间]]></target>
</trans-unit>
<trans-unit id="frontend.filter.departments" approved="yes">
<source><![CDATA[Department]]></source>
<target><![CDATA[行业]]></target>
</trans-unit>
<trans-unit id="frontend.filter.companies" approved="yes">
<source><![CDATA[Company]]></source>
<target><![CDATA[公司]]></target>
......@@ -205,6 +201,10 @@
<source><![CDATA[Country]]></source>
<target><![CDATA[国家]]></target>
</trans-unit>
<trans-unit id="frontend.filter.departments" approved="yes">
<source><![CDATA[Departments]]></source>
<target><![CDATA[行业]]></target>
</trans-unit>
<trans-unit id="frontend.filter.locations" approved="yes">
<source><![CDATA[Location]]></source>
<target><![CDATA[地点]]></target>
......@@ -227,4 +227,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment