From a1be273f67239fd4b6f56fcddc53d903b72bd4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 13 Jul 2018 10:24:06 +0200 Subject: [PATCH] forms: use proper pages calculation to know if page number is out (#25263) --- wcs/forms/root.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/wcs/forms/root.py b/wcs/forms/root.py index 24af84ab..6344ca4b 100644 --- a/wcs/forms/root.py +++ b/wcs/forms/root.py @@ -189,10 +189,6 @@ class FormPage(Directory, FormTemplateMixin): self.code = TrackingCodesDirectory(self.formdef) self.action_url = '.' self.edit_mode = False - - self.page_number = len([ - x for x in self.formdef.fields[1:] if x.type == 'page']) + 1 - self.user = get_request().user get_response().breadcrumb.append( (component + '/', self.formdef.name) ) @@ -629,7 +625,7 @@ class FormPage(Directory, FormTemplateMixin): if 'page_no' in data and int(data['page_no']) != 0: page_no = int(data['page_no']) del data['page_no'] - if page_no == -1 or page_no >= self.page_number: + if page_no == -1 or page_no >= len(self.pages): req = get_request() for k, v in data.items(): req.form['f%s' % k] = v -- 2.18.0