Merge branch '4.13' into 4

FIX broken URL builder when using MultiSelectFields as parameters

javascript/ReportAdmin.js

@@ -2,17 +2,32 @@
  * File: ReportAdmin.js
  */
 
-(function($) {
+(function ($) {
-	$.entwine('ss', function($){
+  $.entwine("ss", function ($) {
-		$('.ReportAdmin .cms-edit-form').entwine({
+    $(".ReportAdmin .cms-edit-form").entwine({
-			onsubmit: function(e) {
+      onsubmit: function (e) {
-				var url = $.path.parseUrl(document.location.href).hrefNoSearch,
+        let url = $.path.parseUrl(document.location.href).hrefNoSearch;
-					params = this.find(':input[name^=filters]').serializeArray();
+        let params = this.find(":input[name^=filters]").serializeArray();
-				params = $.grep(params, function(param) {return (param.value);}); // filter out empty
+
-				if(params) url = $.path.addSearchParams(url, $.param(params));
+        try {
-				$('.cms-container').loadPanel(url);
+          params = $.grep(params, function (param) {
-				return false;
+            // filter out empty
-			}
+            return param.value;
-		});
+          });
-	});
+
+          // convert params to a query string
+          params = $.param(params);
+
+          // append query string to url
+          url += "?" + params;
+
+          $(".cms-container").loadPanel(url);
+        } catch (err) {
+          console.error(err);
+        }
+
+        return false;
+      },
+    });
+  });
 })(jQuery);

lang/en.yml

@@ -1,11 +1,11 @@
 en:
+  SilverStripe\CMS\Controllers\CMSPageHistoryController:
+    PREVIEW: 'Website preview'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filter
   SilverStripe\Reports\ReportAdmin:
     MENUTITLE: Reports
     ReportTitle: Title
   SilverStripe\Reports\SideReport:
     OtherGroupTitle: Other
     REPEMPTY: 'The {title} report is empty.'
-  SilverStripe\CMS\Controllers\CMSPageHistoryController:
-    PREVIEW: 'Website preview'
-  SilverStripe\Forms\GridField\GridField:
-    Filter: Filter

lang/eo.yml

@@ -1,4 +1,8 @@
 eo:
+  SilverStripe\CMS\Controllers\CMSPageHistoryController:
+    PREVIEW: 'Retejon antaŭvidi'
+  SilverStripe\Forms\GridField\GridField:
+    Filter: Filtrilo
   SilverStripe\Reports\ReportAdmin:
     MENUTITLE: Raportoj
     ReportTitle: Titoloj

lang/sk.yml

@@ -1,7 +1,9 @@
 sk:
+  SilverStripe\CMS\Controllers\CMSPageHistoryController:
+    PREVIEW: 'Náhľad webovej stránky'
   SilverStripe\Reports\ReportAdmin:
-    MENUTITLE: Výkazy
+    MENUTITLE: Správy
-    ReportTitle: Titulok
+    ReportTitle: Názov
   SilverStripe\Reports\SideReport:
     OtherGroupTitle: Iné
-    REPEMPTY: 'Výkaz {title} je prázdny.'
+    REPEMPTY: 'Správa {title} je prázdna.'

lang/sv.yml

@@ -1,4 +1,6 @@
 sv:
+  SilverStripe\CMS\Controllers\CMSPageHistoryController:
+    PREVIEW: 'Webbplats förhandsvisning'
   SilverStripe\Reports\ReportAdmin:
     MENUTITLE: Rapporter
     ReportTitle: Titel