Changeset 10683 for main/waeup.kofa/trunk/src/waeup

Timestamp:

2 Nov 2013, 08:18:00 (11 years ago)

Author:

Henrik Bettermann

Message:

hostel_id must not be readonly. Otherwise updateEntry doesn't work in update mode.

Location:

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

Files:

• browser.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests.py (modified) (1 diff)

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

@@ -187 +187 @@
     grok.name('addhostel')
     #grok.template('hosteladdpage')
-    form_fields = grok.AutoFields(IHostel).omit('beds_reserved')
+    form_fields = grok.AutoFields(IHostel).omit('beds_reserved', 'hostel_id')
     label = _('Add hostel')
     pnav = 5

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

@@ -87 +87 @@
     hostel_id = schema.TextLine(
         title = _(u'Hostel Id'),
-        readonly = True,
         )
 

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

@@ -516 +516 @@
         shutil.rmtree(self.workdir)
         return
+
+    def test_import_update(self):
+        self.processor = HostelProcessor()
+        self.workdir = tempfile.mkdtemp()
+        self.csv_file = os.path.join(self.workdir, 'sample_hostel_data.csv')
+        open(self.csv_file, 'wb').write(HOSTEL_SAMPLE_DATA)
+        self.csv_file = os.path.join(self.workdir, 'sample_hostel_data.csv')
+        open(self.csv_file, 'wb').write(HOSTEL_SAMPLE_DATA)
+        num, num_warns, fin_file, fail_file = self.processor.doImport(
+            self.csv_file, HOSTEL_HEADER_FIELDS)
+        # We import the same file in update mode
+        num, num_warns, fin_file, fail_file = self.processor.doImport(
+            self.csv_file, HOSTEL_HEADER_FIELDS, 'update')
+        self.assertEqual(num_warns,0)
+        logcontent = open(self.logfile).read()
+        self.assertTrue(
+            "Hostel Processor - sample_hostel_data - block-a-upper-hostel - "
+            "updated: "
+            "beds_for_pre=['G'], floors_per_block=1, "
+            "beds_for_final=['A', 'B'], rooms_per_floor=32, "
+            "blocks_for_male=[], hostel_id=block-a-upper-hostel, "
+            "sort_id=20, beds_for_returning=['C', 'D'], "
+            "hostel_name=Block A Upper Hostel, beds_for_fresh=['E', 'F'], "
+            "blocks_for_female=['A'], beds_for_all=[], beds_reserved=[]"
+            in logcontent)
+        shutil.rmtree(os.path.dirname(fin_file))
+        shutil.rmtree(self.workdir)
+        return