From 64dbfe39057bf354240a76cbb2495179ed790dac Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 19 Dec 2018 11:18:35 +0100
Subject: [PATCH] Identify auxiliary dbtable forms to prevent collisions

---
 src/Handler/Utils/Table/Pagination.hs | 8 ++++----
 src/Utils/Form.hs                     | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 964323b83..7ddba89b3 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -533,14 +533,14 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
         | otherwise
           = def
 
-  ((filterRes, filterWdgt), filterEnc) <- runFormGet . renderAForm FormDBTableFilter $ (,)
-    <$> areq (jsonField True) ("" & addName (wIdent "pagination")) (Just $ prevPi & _piFilter .~ Nothing & _piPage .~ Nothing)
+  ((filterRes, filterWdgt), filterEnc) <- runFormGet . identForm FIDDBTableFilter . renderAForm FormDBTableFilter $ (,)
+    <$> areq (jsonField True) ("" & addName (wIdent "pagination-base")) (Just $ prevPi & _piFilter .~ Nothing & _piPage .~ Nothing)
     <*> dbtFilterUI
 
   let referencePagesize = psLimit . snd . runPSValidator dbtable $ Just prevPi
 
-  ((pagesizeRes, pagesizeWdgt), pagesizeEnc) <- lift . runFormGet . renderAForm FormDBTablePagesize $ (,)
-    <$> areq (jsonField True) ("" & addName (wIdent "pagination")) (Just $ prevPi & _piPage .~ Nothing & _piLimit .~ Nothing)
+  ((pagesizeRes, pagesizeWdgt), pagesizeEnc) <- lift . runFormGet . identForm FIDDBTablePagesize . renderAForm FormDBTablePagesize $ (,)
+    <$> areq (jsonField True) ("" & addName (wIdent "pagination-base")) (Just $ prevPi & _piPage .~ Nothing & _piLimit .~ Nothing)
     <*> areq (pagesizeField referencePagesize) (fslI MsgDBTablePagesize & addAutosubmit & addName (wIdent "pagesize") & addClass "select--pagesize") (Just referencePagesize)
     <*  autosubmitButton
 
diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs
index 1c2bf385e..db9fa039e 100644
--- a/src/Utils/Form.hs
+++ b/src/Utils/Form.hs
@@ -170,6 +170,8 @@ data FormIdentifier
   | FIDSystemMessageModify
   | FIDSystemMessageModifyTranslation UUID
   | FIDSystemMessageAddTranslation
+  | FIDDBTableFilter
+  | FIDDBTablePagesize
   deriving (Eq, Ord, Read, Show)
 
 instance PathPiece FormIdentifier where