Fixes #6806, correctly set default for viewDataTable query parameter in...

Fixes #6806, correctly set default for viewDataTable query parameter in ViewDataTable\Factory::build(). If forceDefault is true, priority is function specified default, saved value, and report configured default. If not true, saved value, function specified default, report configured default.

core/ViewDataTable/Factory.php

@@ -97,10 +97,6 @@ class Factory
 
         $defaultViewType = self::getDefaultViewTypeForReport($apiAction);
 
-        if (!$forceDefault && !empty($defaultViewType)) {
-            $defaultType = $defaultViewType;
-        }
-
         $isWidget = Common::getRequestVar('widget', '0', 'string');
 
         if (!empty($isWidget)) {
@@ -115,14 +111,22 @@ class Factory
             $savedViewDataTable = $params['viewDataTable'];
         }
 
-        $type = Common::getRequestVar('viewDataTable', $savedViewDataTable, 'string');
+        // order of default viewDataTables' priority is: function specified default, saved default, configured default for report
+        //   function specified default is preferred
+        // -> force default == true : defaultType ?: saved ?: defaultView
+        // -> force default == false : saved ?: defaultType ?: defaultView
+        if ($forceDefault) {
+            $defaultType = $defaultType ?: $savedViewDataTable ?: $defaultViewType;
+        } else {
+            $defaultType = $savedViewDataTable ?: $defaultType ?: $defaultViewType;
+        }
+
+        $type = Common::getRequestVar('viewDataTable', $defaultType, 'string');
 
         // Common::getRequestVar removes backslashes from the defaultValue in case magic quotes are enabled.
         // therefore do not pass this as a default value to getRequestVar()
-        if ('' === $type
-            || $forceDefault
-        ) {
-            $type = $defaultType ? : HtmlTable::ID;
+        if ('' === $type) {
+            $type = $defaultType ?: HtmlTable::ID;
         }
 
         $params['viewDataTable'] = $type;