Merge pull request #42697 from nextcloud/fix/add-settings-section-type-attribute-stable28

blizzz · web-flow · commit 697d0de5112b · 2024-01-17T21:03:44.000+01:00
[stable28] Fix/add settings section type attribute
diff --git a/apps/settings/lib/Controller/CommonSettingsTrait.php b/apps/settings/lib/Controller/CommonSettingsTrait.php
@@ -151,6 +151,7 @@ private function getIndexResponse(string $type, string $section): TemplateRespon
 		if ($activeSection) {
 			$templateParams['pageTitle'] = $activeSection->getName();
 			$templateParams['activeSectionId'] = $activeSection->getID();
+			$templateParams['activeSectionType'] = $type;
 		}
 
 		return new TemplateResponse('settings', 'settings/frame', $templateParams);
diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php
@@ -84,6 +84,6 @@
 		</ul>
 	</nav>
 </div>
-<div id="app-content" data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>">
+<div id="app-content" <?php if (!empty($_['activeSectionId'])) { ?> data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" <?php } if (!empty($_['activeSectionType'])) { ?> data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>" <?php } ?>>
 	<?php print_unescaped($_['content']); ?>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ private function getIndexResponse(string $type, string $section): TemplateRespon`
`151`	`151`	`if ($activeSection) {`
`152`	`152`	`$templateParams['pageTitle'] = $activeSection->getName();`
`153`	`153`	`$templateParams['activeSectionId'] = $activeSection->getID();`
	`154`	`+ $templateParams['activeSectionType'] = $type;`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`return new TemplateResponse('settings', 'settings/frame', $templateParams);`