Merge pull request #476 from jjrom/develop

Change visibility naming from 'all' to 'public' as it is more human u…
jjrom · Dec 9, 2024 · 0b3300c · 0b3300c
2 parents 9decc1d + 6c44ebd
commit 0b3300c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/app/resto/core/RestoContext.php b/app/resto/core/RestoContext.php
@@ -57,9 +57,9 @@ class RestoContext
         'defaultModel' => 'DefaultModel',
 
         // Default visibility applied to collection, catalog and item created by non admin user
-        'defaultCollectionVisibility' => 'all',
-        'defaultCatalogVisibility' => 'all',
-        'defaultItemVisibility' => 'all',
+        'defaultCollectionVisibility' => 'public',
+        'defaultCatalogVisibility' => 'public',
+        'defaultItemVisibility' => 'public',
 
         // Use cache
         'useCache' => false,

diff --git a/build/resto/config.php.template b/build/resto/config.php.template
@@ -12,9 +12,9 @@ return array(
     'storeQuery' => ${STORE_QUERY:-false},
     'collectionMinMatch' => ${COLLECTION_MINMATCH:-0},
     'defaultModel' => '${DEFAULT_COLLECTION_MODEL:-DefaultModel}',
-    'defaultCollectionVisibility' => '${DEFAULT_COLLECTION_VISIBILITY:-all}',
-    'defaultCatalogVisibility' => '${DEFAULT_CATALOG_VISIBILITY:-all}',
-    'defaultItemVisibility' => '${DEFAULT_ITEM_VISIBILITY:-all}',
+    'defaultCollectionVisibility' => '${DEFAULT_COLLECTION_VISIBILITY:-public}',
+    'defaultCatalogVisibility' => '${DEFAULT_CATALOG_VISIBILITY:-public}',
+    'defaultItemVisibility' => '${DEFAULT_ITEM_VISIBILITY:-public}',
     'timezone' => '${TIMEZONE:-Europe/Paris}',
     'tokenDuration' => ${JWT_DURATION:-8640000},
     'userAutoValidation' => ${USER_AUTOVALIDATION:-true},

diff --git a/config.env b/config.env
@@ -28,11 +28,10 @@ RESTO_EXPOSED_PORT=5252
 #DEFAULT_COLLECTION_MODEL=DefaultModel
 
 ### Default GROUP visibility applied to collection,catalog and items
-### when they are created with a non admin user
-### Should be one of "all" or "owner"
-#DEFAULT_COLLECTION_VISIBILITY=all
-#DEFAULT_CATALOG_VISIBILITY=all
-#DEFAULT_ITEM_VISIBILITY=all
+### when they are created with a non admin user. Should be one of "public" or "owner"
+#DEFAULT_COLLECTION_VISIBILITY=public
+#DEFAULT_CATALOG_VISIBILITY=public
+#DEFAULT_ITEM_VISIBILITY=public
 
 ### Permanent storage directory to store/retrieve files (e.g. user's avatar picture)
 ### Relative to PUBLIC_ENDPOINT if not starting with http