[BUGFIX] Make it possible to return to file_list search result 32/43932/4
authorDaniel Goerz <ervaude@gmail.com>
Fri, 9 Oct 2015 12:34:15 +0000 (14:34 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Fri, 9 Oct 2015 18:12:31 +0000 (20:12 +0200)
Change-Id: I54d7c8260bc3bef988801614b8d053560f2f0254
Resolves: #70184
Releases: master
Reviewed-on: http://review.typo3.org/43932
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Patrick Schriner <patrick.schriner@diemedialen.de>
Tested-by: Patrick Schriner <patrick.schriner@diemedialen.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html

index 8c25341..f48a0e7 100644 (file)
@@ -43,7 +43,7 @@
                                                                <f:then>
                                                                        <a href="#" class="filelist-file-title"
                                                                                title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editMetadata' )}"
-                                                                               data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:searchWord } )->format.htmlentities()}' )}"
+                                                                               data-url="{fl:uri.editSysFileMetadataRecord( uid:file.metadataUid, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
                                                                        >
                                                                                {file.name->f:format.crop( maxCharacters:30 )}
                                                                        </a>
@@ -63,7 +63,7 @@
                                                                        <f:then>
                                                                                <a href="#" class="btn btn-default filelist-file-edit"
                                                                                        title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.editcontent' )}"
-                                                                                       data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:searchWord } )}' )->format.htmlentities()}"
+                                                                                       data-url="{fl:uri.editFileContent( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
                                                                                >
                                                                                        <core:icon identifier="actions-page-open" />
                                                                                </a>
@@ -91,7 +91,7 @@
                                                                        <f:then>
                                                                                <a href="#" class="btn btn-default filelist-file-replace"
                                                                                        title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.replace' )}"
-                                                                                       data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:searchWord } )}' )->format.htmlentities()}"
+                                                                                       data-url="{fl:uri.replaceFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
                                                                                >
                                                                                        <core:icon identifier="actions-edit-replace" />
                                                                                </a>
                                                                        <f:then>
                                                                                <a href="#" class="btn btn-default filelist-file-rename"
                                                                                        title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.rename' )}"
-                                                                                       data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:searchWord } )}' )->format.htmlentities()}"
+                                                                                       data-url="{fl:uri.renameFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
                                                                                >
                                                                                        <core:icon identifier="actions-edit-rename" />
                                                                                </a>
                                                                        <f:then>
                                                                                <a href="#" class="btn btn-default filelist-file-delete"
                                                                                        title="{f:translate( htmlEscape:'true', key:'LLL:EXT:lang/locallang_core.xlf:cm.delete' )}"
-                                                                                       data-url="{fl:uri.deleteFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:searchWord } )}' )->format.htmlentities()}"
+                                                                                       data-url="{fl:uri.deleteFile( file:file.resource, returnUrl:'{f:uri.action( action:\'search\', arguments:{ searchWord:\'{searchWord->f:format.htmlentities()}\' } )}' )}"
                                                                                        data-confirmation-dialogue="{f:if( condition:settings.jsConfirmationDelete, then:'confirm({f:translate( htmlEscape:\'true\', key:\'LLL:EXT:lang/locallang_core.xlf:mess.delete\', arguments: {0:file.name} )})', else:'1 == 1' )}"
                                                                                >
                                                                                        <core:icon identifier="actions-edit-delete" />