From c47ec12c94f93b628e9ef96f648965df4468c41c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 28 Aug 2023 11:46:30 +0530 Subject: [PATCH 1/4] seach by email --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7622565d..d148f78e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.8" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,8,2/25,0,8,21/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,8,2/25,0,8,22/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images @@ -246,6 +246,10 @@ RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]}, RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml +#enable email search in memories app + +RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/fr\.D\.SHARE_TYPE_USER,fr\.D\.SHARE_TYPE_GROUP/fr.D.SHARE_TYPE_USER,fr.D.SHARE_TYPE_GROUP,fr.D.SHARE_TYPE_EMAIL/g' js/memories-main.js +RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's|;case"groups”:|;case"email":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_EMAIL};case"groups":|g' js/memories-main.js # 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 -- GitLab From 5d90104d337b84200ab5f3873ae6e3f3a12f0d50 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 31 Aug 2023 15:10:25 +0530 Subject: [PATCH 2/4] group removed --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d148f78e..c68c6bf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -248,8 +248,8 @@ RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\Migr #enable email search in memories app -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/fr\.D\.SHARE_TYPE_USER,fr\.D\.SHARE_TYPE_GROUP/fr.D.SHARE_TYPE_USER,fr.D.SHARE_TYPE_GROUP,fr.D.SHARE_TYPE_EMAIL/g' js/memories-main.js -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's|;case"groups”:|;case"email":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_EMAIL};case"groups":|g' js/memories-main.js +RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/fr\.D\.SHARE_TYPE_USER,fr\.D\.SHARE_TYPE_GROUP/fr.D.SHARE_TYPE_USER,fr.D.SHARE_TYPE_EMAIL/g' js/memories-main.js +RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/case"groups":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_GROUP};/case"emails":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_EMAIL};/g' js/memories-main.js # 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 -- GitLab From df9a1689466da8d026119919a56e3726ad4997f1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 1 Sep 2023 21:44:29 +0530 Subject: [PATCH 3/4] return {} when email --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c68c6bf9..326f5e07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -249,7 +249,7 @@ RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\Migr #enable email search in memories app RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/fr\.D\.SHARE_TYPE_USER,fr\.D\.SHARE_TYPE_GROUP/fr.D.SHARE_TYPE_USER,fr.D.SHARE_TYPE_EMAIL/g' js/memories-main.js -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/case"groups":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_GROUP};/case"emails":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_EMAIL};/g' js/memories-main.js +RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/case"groups":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_GROUP};/case"emails":return{};/g' js/memories-main.js # 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 -- GitLab From bd75b0bdc22bc25124a8d3812c155dfd4cac32ee Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 5 Sep 2023 01:04:44 +0530 Subject: [PATCH 4/4] sed command fix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 326f5e07..0e803b34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -248,8 +248,8 @@ RUN cd ${BASE_DIR}/apps/theming && sed -i 's/OCA\\Theming\\Migration\\Migr #enable email search in memories app -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/fr\.D\.SHARE_TYPE_USER,fr\.D\.SHARE_TYPE_GROUP/fr.D.SHARE_TYPE_USER,fr.D.SHARE_TYPE_EMAIL/g' js/memories-main.js -RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/case"groups":return{id:e.id,label:e.label,type:fr.D.SHARE_TYPE_GROUP};/case"emails":return{};/g' js/memories-main.js +RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/shareTypes:\[fr\.D\.SHARE_TYPE_USER,fr\.D\.SHARE_TYPE_GROUP\]}});/shareTypes:[fr.D.SHARE_TYPE_USER,fr.D.SHARE_TYPE_EMAIL]}}),n=e.data.ocs.data.filter((e=>"emails"!==e.source)),r={data:{ocs:{meta:e.data.ocs.meta,data:n}}};/g' js/memories-main.js +RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/this\.currentSearchResults=e\.data\./this\.currentSearchResults=r\.data\./g' js/memories-main.js # 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 -- GitLab