Changeset 10099

Timestamp:

24 Apr 2013, 05:52:57 (12 years ago)

Author:

Henrik Bettermann

Message:

Change navigation after data import.

Location:

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

Files:

• batchprocessing.txt (modified) (1 diff)
• pages.py (modified) (2 diffs)
• templates/datacenterimport4page.pt (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/batchprocessing.txt

@@ -146 +146 @@
 We can grep the entries generated in logfile:
 
-    >>> browser.getControl('View processing log').click()
+    >>> browser.open('http://localhost/app/datacenter/logs')
+    >>> browser.getControl('Show', index=0).click()
     >>> print browser.contents
     <!DOCTYPE ...

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

@@ -1414 +1414 @@
     label = _(u'Process CSV file')
     pnav = 0
-    show_button =_(u'View processing log')
-    back_button =_(u'Back to data center')
+    back_button =_(u'Process next')
 
     filename = None
@@ -1425 +1424 @@
     def update(self, back=None, finish=None, showlog=None):
         if finish is not None:
-            self.redirect(self.url(self.context))
+            self.redirect(self.url(self.context, '@@import1'))
             return
         session = ISession(self.request)['waeup.kofa']

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport4page.pt

@@ -18 +18 @@
     tal:attributes="value view/back_button" />
 </form>
-<form method="POST" i18n:domain="waeup.kofa" action="@@show">
-  <input class="btn" type="submit" name="showlog"
-    tal:attributes="value view/show_button" />
-  <input type="hidden" name="logname" tal:attributes="value string:datacenter.log" />
-</form>
+