From 95b56c1b67a5c9e07558b9a9efe4447f9f607c84 Mon Sep 17 00:00:00 2001
From: Ronak <ronak@Ronaks-MacBook-Pro.local>
Date: Wed, 24 May 2023 23:25:42 -0700
Subject: [PATCH 1/2] Order issue in dashboard

---
 appinfo/info.xml            | 2 +-
 lib/Service/AppsService.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 8f545ea..7f50ed3 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <name>Murena Dashboard</name>
     <summary>Murena Dashboard</summary>
     <description><![CDATA[Murena Dashboard]]></description>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com">Murena</author>
     <namespace>MurenaDashboard</namespace>
diff --git a/lib/Service/AppsService.php b/lib/Service/AppsService.php
index 84f511f..f17549f 100644
--- a/lib/Service/AppsService.php
+++ b/lib/Service/AppsService.php
@@ -75,7 +75,7 @@ class AppsService {
 	}
 
 	public function getAppOrder() {
-		$order_raw = $this->config->getUserValue($this->userId, $this->appName, 'order');
+		$order_raw = $this->config->getUserValue($this->userId, 'murena_launcher', 'order');
 		// If order raw empty try to get from 'apporder' app config
 		$order_raw = !$order_raw ? $this->config->getUserValue($this->userId, 'apporder', 'order') : $order_raw;
 		// If order raw is still empty, return empty array
-- 
GitLab


From ae725b0e53d7aef3c7d874650762f3f68ecb0c09 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 25 May 2023 12:31:37 +0530
Subject: [PATCH 2/2] Fix $appName assignment

---
 lib/Controller/PageController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index ef909ac..6d40f46 100755
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -22,12 +22,14 @@ class PageController extends Controller {
 
 	private AppsService $appsService;
 
+	private string $appName;
 
 	public function __construct($appName, IRequest $request, IInitialState $initialState, IConfig $config, IUserSession $userSession, AppsService $appsService) {
 		$this->initialState = $initialState;
 		$this->config = $config;
 		$this->userSession = $userSession;
 		$this->appsService = $appsService;
+		$this->appName = $appName;
 		parent::__construct($appName, $request);
 	}
 
-- 
GitLab