From 3b4764962e7adcfdc7355b483068d28f07af03aa Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 15 Sep 2022 11:11:59 +0530 Subject: [PATCH 1/3] error class added --- Dockerfile | 1 + patches/021-patch_scheduleresponseerror.patch | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 patches/021-patch_scheduleresponseerror.patch diff --git a/Dockerfile b/Dockerfile index e321a777..d0fd4cbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,6 +127,7 @@ RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/01 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch +RUN patch -u ${BASE_DIR}/apps/dav/templates/schedule-response-error.php -i ${TMP_PATCH_DIR}/021-patch_scheduleresponseerror.patch RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param diff --git a/patches/021-patch_scheduleresponseerror.patch b/patches/021-patch_scheduleresponseerror.patch new file mode 100644 index 00000000..43d7e1d0 --- /dev/null +++ b/patches/021-patch_scheduleresponseerror.patch @@ -0,0 +1,8 @@ +--- ./apps/dav/templates/schedule-response-error.php 2022-09-06 21:39:44.185827300 +0530 ++++ ./apps/dav/templates/schedule-response-error-new.php 2022-09-15 10:56:15.917350600 +0530 +@@ -1,4 +1,4 @@ +-
++
+

t('There was an error updating your attendance status.'));?>

+

t('Please contact the organizer directly.'));?>

+ -- GitLab From ee7978fcc690feccab644976757e35eaf6be289d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 21 Sep 2022 10:52:42 +0530 Subject: [PATCH 2/3] sed command added --- Dockerfile | 4 +++- patches/021-patch_scheduleresponseerror.patch | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 patches/021-patch_scheduleresponseerror.patch diff --git a/Dockerfile b/Dockerfile index d0fd4cbd..250400d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,7 +127,6 @@ RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/01 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch -RUN patch -u ${BASE_DIR}/apps/dav/templates/schedule-response-error.php -i ${TMP_PATCH_DIR}/021-patch_scheduleresponseerror.patch RUN rm -rf ${TMP_PATCH_DIR} # show reset pwd page with a query param @@ -151,6 +150,9 @@ RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/in # Remove changeAvatar in changeUserHook of ldap_write_support as it throws errors RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_apps/ldap_write_support/lib/LDAPUserManager.php +#replace error class in schedule response error file to fix error color +sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php + # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ diff --git a/patches/021-patch_scheduleresponseerror.patch b/patches/021-patch_scheduleresponseerror.patch deleted file mode 100644 index 43d7e1d0..00000000 --- a/patches/021-patch_scheduleresponseerror.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./apps/dav/templates/schedule-response-error.php 2022-09-06 21:39:44.185827300 +0530 -+++ ./apps/dav/templates/schedule-response-error-new.php 2022-09-15 10:56:15.917350600 +0530 -@@ -1,4 +1,4 @@ --
-+
-

t('There was an error updating your attendance status.'));?>

-

t('Please contact the organizer directly.'));?>

- -- GitLab From 30968eabc2db814bbe663afb97ed660b3549633d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 21 Sep 2022 10:54:17 +0530 Subject: [PATCH 3/3] sed command added --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 250400d5..fedacf7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -151,7 +151,7 @@ RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/in RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_apps/ldap_write_support/lib/LDAPUserManager.php #replace error class in schedule response error file to fix error color -sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php +RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ -- GitLab