Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 45c7d3009391 · 2023-04-12T16:38:00.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php
@@ -14,6 +14,7 @@
 
 use function __;
 use function count;
+use function define;
 
 class TwoFactorController extends AbstractController
 {
@@ -66,5 +67,11 @@ public function __invoke(ServerRequest $request): void
             'backends' => $twoFactor->getAllBackends(),
             'missing' => $twoFactor->getMissingDeps(),
         ]);
+
+        if ($this->response->isAjax()) {
+            $this->response->addJSON('disableNaviSettings', true);
+        } else {
+            define('PMA_DISABLE_NAVI_SETTINGS', true);
+        }
     }
 }
diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss
@@ -889,7 +889,7 @@ textarea#partitiondefinition {
 
 // for elements that should be revealed only via js
 .hide {
-  display: none;
+  display: none !important;
 }
 
 #list_server {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`use function __;`
`16`	`16`	`use function count;`
	`17`	`+use function define;`
`17`	`18`
`18`	`19`	`class TwoFactorController extends AbstractController`
`19`	`20`	`{`
`@@ -66,5 +67,11 @@ public function __invoke(ServerRequest $request): void`
`66`	`67`	`'backends' => $twoFactor->getAllBackends(),`
`67`	`68`	`'missing' => $twoFactor->getMissingDeps(),`
`68`	`69`	`]);`
	`70`	`+`
	`71`	`+ if ($this->response->isAjax()) {`
	`72`	`+ $this->response->addJSON('disableNaviSettings', true);`
	`73`	`+ } else {`
	`74`	`+ define('PMA_DISABLE_NAVI_SETTINGS', true);`
	`75`	`+ }`
`69`	`76`	`}`
`70`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -889,7 +889,7 @@ textarea#partitiondefinition {`
`889`	`889`
`890`	`890`	`// for elements that should be revealed only via js`
`891`	`891`	`.hide {`
`892`		`- display: none;`
	`892`	`+ display: none !important;`
`893`	`893`	`}`
`894`	`894`
`895`	`895`	`#list_server {`