Changeset 13426 for main

Timestamp:

10 Nov 2015, 06:44:30 (9 years ago)

Author:

Henrik Bettermann

Message:

Only forbid import step 4 if maintenance is not enabled.

Do not create hostel ids with dots.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/pages.py (modified) (2 diffs)
• hostels/browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -1374 +1374 @@
 
     def update(self, filename=None, select=None, cancel=None):
-        if not grok.getSite()['configuration'].maintmode_enabled_by and \
-            not self.request.principal.id == 'admin':
+        if not grok.getSite()['configuration'].maintmode_enabled_by:
             self.flash(
                 _('Portal must be in maintenance mode for data import.'),
                 type='warning')
-            self.redirect(self.url(self.context))
-            return
         if cancel is not None:
             self.redirect(self.url(self.context))
@@ -1627 +1624 @@
 
     def update(self, back=None, finish=None, showlog=None):
+        if not grok.getSite()['configuration'].maintmode_enabled_by and \
+            not self.request.principal.id == 'admin':
+            self.flash(
+                _('File has not been imported. '
+                  'Portal must be in maintenance mode for data import.'),
+                type='danger')
+            self.redirect(self.url(self.context))
+            return
         if finish is not None:
             self.redirect(self.url(self.context, '@@import1'))

main/waeup.kofa/trunk/src/waeup/kofa/hostels/browser.py

@@ -204 +204 @@
         hostel = Hostel()
         self.applyData(hostel, **data)
-        hostel.hostel_id = data[
-            'hostel_name'].lower().replace(' ','-').replace('_','-')
+        hostel.hostel_id = data['hostel_name'].lower().replace(
+            ' ','-').replace('_','-').replace('.','')
         try:
             self.context.addHostel(hostel)