diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php index ccb4445fcb8638bd0b21a1083f0dabc69808b1ab..8fe22dd1efbcf298505d06d2cdfabfad826e86d9 100644 --- a/Classes/Controller/BackendController.php +++ b/Classes/Controller/BackendController.php @@ -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); } diff --git a/Configuration/TCA/tx_sgjobs_domain_model_job.php b/Configuration/TCA/tx_sgjobs_domain_model_job.php index be4faebfbe8c0c2e2d08dcb7b1a0e682700126d5..05ff844dc8463f45ed508e6196fba66f6691e31f 100644 --- a/Configuration/TCA/tx_sgjobs_domain_model_job.php +++ b/Configuration/TCA/tx_sgjobs_domain_model_job.php @@ -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' ); diff --git a/Resources/Private/Backend/Partials/JobList.html b/Resources/Private/Backend/Partials/JobList.html index be4a0dfc7b5dfc7270cda2814cea196e2bba8c95..9b1e1013118c2848bda9099ea77f15ee81a76bfe 100644 --- a/Resources/Private/Backend/Partials/JobList.html +++ b/Resources/Private/Backend/Partials/JobList.html @@ -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"> diff --git a/Resources/Private/Backend/Templates/Index.html b/Resources/Private/Backend/Templates/Index.html index 9dd2e2e28183fd0f36efc31c1b83a744383e9dbe..fbfb7918a15413ca552e8c4e0d98423ac4ce4cf1 100644 --- a/Resources/Private/Backend/Templates/Index.html +++ b/Resources/Private/Backend/Templates/Index.html @@ -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> diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf index a6e8ec0627a5be4572bae4102323429b13ea8f42..4a6d688c359884c9c2a5c4a9e2255b5d57d2e01d 100644 --- a/Resources/Private/Language/de.locallang.xlf +++ b/Resources/Private/Language/de.locallang.xlf @@ -1,6 +1,6 @@ <?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 diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf index e2cdf4c55a27cc0f1b6c06f3ce66b3581863dbe0..aeaeee04238a3da3caa3d82f2c13e1bcff018a38 100644 --- a/Resources/Private/Language/de.locallang_db.xlf +++ b/Resources/Private/Language/de.locallang_db.xlf @@ -1,6 +1,6 @@ <?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 diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index 26377abf6c3ff96473bdb78c510541e96153be29..854086d2bbba8ec129b34c3daaa21727e3a47561 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -1,6 +1,6 @@ <?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 diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf index 50d3a9110c66d9a58fc6af2739ed0e6ce7e08eea..7b990fb4ffafc81d767384039590c1c351c420ff 100644 --- a/Resources/Private/Language/locallang_db.xlf +++ b/Resources/Private/Language/locallang_db.xlf @@ -1,6 +1,6 @@ <?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 diff --git a/Resources/Private/Language/zh.locallang.xlf b/Resources/Private/Language/zh.locallang.xlf index d8aaccc9cb9a78c916cac1c042d094b182bef519..32a997c224141c132ec4cbf202c9eb73329ff4de 100644 --- a/Resources/Private/Language/zh.locallang.xlf +++ b/Resources/Private/Language/zh.locallang.xlf @@ -1,6 +1,6 @@ <?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