Merge branch 'develop' into bugfix/intl-segmenter-polyfill

CHANGELOG.md

@@ -1,9 +1,23 @@
 ## [Unreleased]
 
-## 5.1.4-rc1
+## 5.2.2
 ### Fixed
 - fix #464: add Intl.Segmenter polyfill
 
+## 5.2.1
+### Added
+- chore: set side_menu as package name
+### Fixed
+- fix(LangRepository): check orm capabilities to query entities
+- fix(admin/\*SaveButton): cast settings to string
+
+## 5.2.0
+### Added
+* add compatibility with NC33
+### Fixed
+* fix #468: force nextcloud logo display css rule (opener-only)
+>>>>>>> develop
+
 ## 5.1.3
 ### Fixed
 - fix #445: fix build by adding package-lock.json

appinfo/info.xml

@@ -30,7 +30,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>5.1.4-rc1</version>
+    <version>5.2.2</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -53,7 +53,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
     <dependencies>
         <php min-version="8.1" max-version="8.4" />
-        <nextcloud min-version="31" max-version="32"/>
+        <nextcloud min-version="31" max-version="33"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

lib/Service/LangRepository.php

@@ -30,7 +30,12 @@ class LangRepository
             ->from('preferences')
         ;
 
+        // Nextcloud >=33+
+        if (method_exists($qb, 'executeQuery')) {
+            $stmt = $qb->executeQuery();
+        } else {
             $stmt = $qb->execute();
+        }
 
         $langs = ['en'];
 

src/components/settings/AdminSaveButton.vue

@@ -73,10 +73,10 @@ const save = async () => {
         if (Array.isArray(value) || typeof value === 'object') {
           value = JSON.stringify(value)
         } else if (typeof value === 'boolean') {
-          value = value ? 1 : 0
+          value = value ? '1' : '0'
         }
 
-        OCP.AppConfig.setValue('side_menu', key, value, {
+        OCP.AppConfig.setValue('side_menu', key, value.toString(), {
           success() {
             update()
           },

src/components/settings/UserSaveButton.vue

@@ -69,11 +69,11 @@ const save = async () => {
     if (Array.isArray(value) || typeof value === 'object') {
       value = JSON.stringify(value)
     } else if (typeof value === 'boolean') {
-      value = value ? 1 : 0
+      value = value ? '1' : '0'
     }
 
     formData.push('name=' + encodeURIComponent(key))
-    formData.push('value=' + encodeURIComponent(value))
+    formData.push('value=' + encodeURIComponent(value.toString()))
 
     fetch(url, {
       method: 'POST',

templates/css/stylesheet.php

@@ -38,7 +38,7 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
 
 <?php if ($_['opener-only']) { ?>
   #nextcloud {
-    display: none;
+    display: none !important;
   }
 <?php } ?>