Merge branch 'develop' into feature/#66-fehlerseiten

src/backoffice/forms.py

@@ -336,6 +336,19 @@ class EditAssemblyRoomWorkAdventureForm(forms.ModelForm):
         self.fields['backend_link'].disabled = True
 
 
+class EditAssemblyRoomHangarForm(forms.ModelForm):
+    class Meta:
+        model = Room
+        fields = ['backend_status', 'backend_link']
+
+    def __init__(self, with_capacity=False, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['backend_status'].disabled = True
+        self.fields['backend_link'].label = _('Room-hangar_backend_link')
+        self.fields['backend_link'].help_text = _('Room-hangar_backend_link__help')
+        self.fields['backend_link'].disabled = True
+
+
 class CreateAssemblyRoomLinkForm(forms.ModelForm):
     class Meta:
         model = RoomLink

src/backoffice/locale/de/LC_MESSAGES/django.po

@@ -51,6 +51,12 @@ msgstr "<Stunden>:<Minuten>:<Sekunden> oder ISO 8601"
 msgid "Event__name__alreadyexists"
 msgstr "Ein Event mit diesem Namen existiert bereits in dieser Assembly!"
 
+msgid "Room-hangar_backend_link"
+msgstr "Hangar-Zugriff"
+
+msgid "Room-hangar_backend_link__help"
+msgstr "Private FTP-Zugang um Dateien im Hangar abzulegen"
+
 msgid "StaticPage__cannot_publish_draft"
 msgstr "eine als Entwurf markierte Revision kann nicht veröffentlicht werden"
 

src/backoffice/locale/en/LC_MESSAGES/django.po

@@ -51,6 +51,12 @@ msgstr "<hours>:<minutes>:<seconds> or ISO 8601"
 msgid "Event__name__alreadyexists"
 msgstr "An event with this name already exists in this assembly!"
 
+msgid "Room-hangar_backend_link"
+msgstr "Hangar Access"
+
+msgid "Room-hangar_backend_link__help"
+msgstr "your private ftp access to put files on your hangar"
+
 msgid "StaticPage__cannot_publish_draft"
 msgstr "Cannot publish a revision marked as draft."
 

src/backoffice/views/assemblies.py

@@ -29,7 +29,7 @@ from ..forms import \
     AssemblyCreateForm, AssemblyCreateRoomGenericForm, AssemblyCreateRoomBigBlueButtonForm, AssemblyCreateRoomWorkAdventureForm, AssemblyCreateRoomHangarForm, \
     AssemblyEditForm, \
     CreateAssemblyRoomLinkForm, \
-    EditAssemblyRoomForm, EditAssemblyRoomWorkAdventureForm, \
+    EditAssemblyRoomForm, EditAssemblyRoomHangarForm, EditAssemblyRoomWorkAdventureForm, \
     AssignBadgeForm
 
 from .mixins import ConferenceMixin, AssemblyMixin
@@ -309,13 +309,13 @@ class AssemblyRoomView(AssemblyMixin, UpdateView):
         return room
 
     def get_form(self, *args, **kwargs):
-        if self.object.room_type != Room.RoomType.WORKADVENTURE:
-            form = super().get_form(*args, **kwargs)
-            return form
+        if self.object.room_type == Room.RoomType.WORKADVENTURE:
+            return EditAssemblyRoomWorkAdventureForm(instance=self.object)
 
-        else:  # WorkAdventure
-            form = EditAssemblyRoomWorkAdventureForm(instance=self.object)
+        if self.object.room_type == Room.RoomType.HANGAR:
+            return EditAssemblyRoomHangarForm(instance=self.object)
 
+        form = super().get_form(*args, **kwargs)
         return form
 
     def form_valid(self, form):