Merge pull request #995 from nextcloud/workflow-section

Workflow section + hidden empty sections

2 files changed, 11 insertions, 6 deletions

diff --git a/lib/private/ServerContainer.php b/lib/private/ServerContainer.php
index 1bab2587e8d..df0293addf7 100644
--- a/lib/private/ServerContainer.php
+++ b/lib/private/ServerContainer.php
@@ -23,6 +23,7 @@
 namespace OC;
 
 
+use OC\AppFramework\App;
 use OC\AppFramework\DependencyInjection\DIContainer;
 use OC\AppFramework\Utility\SimpleContainer;
 use OCP\AppFramework\QueryException;
@@ -49,7 +50,7 @@ class ServerContainer extends SimpleContainer {
 	 * @param DIContainer $container
 	 */
 	public function registerAppContainer($appName, DIContainer $container) {
-		$this->appContainers[$appName] = $container;
+		$this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
 	}
 
 	/**
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index 7574695d709..df2f52f816d 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -107,7 +107,7 @@ class Manager implements IManager {
 		if(isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) {
 			$this->remove(self::TABLE_ADMIN_SECTIONS, $appInfo['settings'][IManager::KEY_ADMIN_SECTION]);
 		}
-		if(isset($settings['settings'][IManager::KEY_ADMIN_SETTINGS])) {
+		if(isset($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS])) {
 			$this->remove(self::TABLE_ADMIN_SETTINGS, $appInfo['settings'][IManager::KEY_ADMIN_SETTINGS]);
 		}
 	}
@@ -327,10 +327,6 @@ class Manager implements IManager {
 	 * @inheritdoc
 	 */
 	public function getAdminSections() {
-		$query = $this->dbc->getQueryBuilder();
-		$query->select(['class', 'priority'])
-			->from(self::TABLE_ADMIN_SECTIONS);
-
 		// built-in sections
 		$sections = [
 			 0 => [new Section('server',        $this->l->t('Server settings'), 0)],
@@ -341,7 +337,15 @@ class Manager implements IManager {
 			99 => [new Section('tips-tricks',   $this->l->t('Tips & tricks'), 0)],
 		];
 
+		$query = $this->dbc->getQueryBuilder();
+		$query->selectDistinct('s.class')
+			->addSelect('s.priority')
+			->from(self::TABLE_ADMIN_SECTIONS, 's')
+			->from(self::TABLE_ADMIN_SETTINGS, 'f')
+			->where($query->expr()->eq('s.id', 'f.section'))
+		;
 		$result = $query->execute();
+
 		while($row = $result->fetch()) {
 			if(!isset($sections[$row['priority']])) {
 				$sections[$row['priority']] = [];