photo-objects 0.10.0__tar.gz → 0.10.2__tar.gz

{photo_objects-0.10.0 → photo_objects-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.10.0
+Version: 0.10.2
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.10.0 → photo_objects-0.10.2}/photo_objects/django/forms.py

@@ -20,6 +20,10 @@ from .models import Album, Photo, PhotoChangeRequest
 KEY_POSTFIX_CHARS = 'bcdfghjklmnpqrstvwxz2456789'
 KEY_POSTFIX_LEN = 5
 
+ALBUM_TITLE_HELP = _(
+    'When creating a new album, album key is generated based on the title. '
+    'Modifying the title later does not change the album key.'
+)
 ALT_TEXT_HELP = _('Alternative text content for the photo.')
 
 
@@ -37,6 +41,44 @@ def description_help(resource):
     }
 
 
+def visibility_help(visibility: str):
+    visibility = Album.Visibility(visibility)
+    if visibility == Album.Visibility.PUBLIC:
+        return _(
+            'The album is visible to anyone without authentication.')
+    if visibility == Album.Visibility.HIDDEN:
+        return _(
+            'The album is visible to anyone with the link. Only '
+            'authenticated users can see the album in albums list.')
+    if visibility == Album.Visibility.PRIVATE:
+        return _(
+            'The album is only visible to authenticated users.')
+    if visibility == Album.Visibility.ADMIN:
+        return _(
+            'The album is only visible to admin users.')
+    return None
+
+
+class VisibilityRadioSelect(RadioSelect):
+    def create_option(
+        self, name, value, label, selected, index, subindex=None, attrs=None
+    ):
+        option = super().create_option(
+            name,
+            value,
+            label,
+            selected,
+            index,
+            subindex=subindex,
+            attrs=attrs)
+        option['label'] = mark_safe(f'''
+<div>
+  <span class="label">{label}</span>
+  <p class="helptext">{visibility_help(option.get('value'))}</p>
+</div>''')
+        return option
+
+
 def _check_admin_visibility(form):
     if form.user and form.user.is_staff:
         return
@@ -60,7 +102,10 @@ class CreateAlbumForm(ModelForm):
         fields = ['key', 'title', 'description', 'visibility']
         help_texts = {
             **description_help('album'),
+            'title': ALBUM_TITLE_HELP,
         }
+        widgets = {'visibility': VisibilityRadioSelect(
+            attrs={'class': 'visibility-select'}), }
 
     def __init__(self, *args, user=None, **kwargs):
         super().__init__(*args, **kwargs)
@@ -136,9 +181,15 @@ class ModifyAlbumForm(ModelForm):
             'cover_photo': _(
                 'Select a cover photo for the album. The cover photo is '
                 'visible on the albums list page and in album preview image.'),
+            'title': ALBUM_TITLE_HELP,
         }
         widgets = {
-            'cover_photo': RadioSelect(attrs={'class': 'photo-select'}),
+            'cover_photo': RadioSelect(
+                attrs={
+                    'class': 'photo-select'}),
+            'visibility': VisibilityRadioSelect(
+                attrs={
+                    'class': 'visibility-select'}),
         }
 
     def __init__(self, *args, user=None, **kwargs):

{photo_objects-0.10.0 → photo_objects-0.10.2}/photo_objects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.10.0
+Version: 0.10.2
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.10.0 → photo_objects-0.10.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "photo-objects"
-version = "0.10.0"
+version = "0.10.2"
 dependencies = [
     "markdown~=3.7",
     "minio>=7.2.0,<7.2.19",