Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ed7de050 authored by Akhil's avatar Akhil 🙂
Browse files

Remove patches to dashboard app

parent 366f6793

Dockerfile

+0 −4
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003- 
RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch

RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch

RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch

RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch

RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch

RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch
@@ -181,9 +180,6 @@ RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIV 
RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[a,"displayname"\]},//' js/calendar-main.js



# Set default widgets to calendar, tasks and notes

RUN sed -i 's/recommendations,spreed,mail,calendar/calendar,tasks,notes/' ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php



# Remove colored background from email template logo

RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php

patches/012-remove-user-status-widget.patch

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
From: Akhil <akhil@e.email>

Date: Fri, 17 Sep 2021 13:00 +0530

Subject: [PATCH] Removes user status widget from Dashboard



This patch removes user status widget from available widgets in dashboard



--- DashboardController.php	2021-09-17 12:56:19.691685082 +0530

+++ DashboardController-new.php	2021-09-17 12:59:18.906502554 +0530

@@ -108,6 +108,9 @@

 				'url' => $widget->getUrl()

 			];

 		}, $this->dashboardManager->getWidgets());

+                $widgets = array_filter($widgets, function($widget) {

+                        return($widget['id'] !== "user_status");

+                });

 		$configStatuses = $this->config->getUserValue($this->userId, 'dashboard', 'statuses', '');

 		$statuses = json_decode($configStatuses, true);

 		// We avoid getting an empty array as it will not produce an object in UI's JS