Merge pull request #326 from digitallyinduced/benchmark-fixes

Added toJSON instance for ID' and added charset to Content-Type
digitallyinduced · Aug 12, 2020 · df79e55 · df79e55
2 parents 24c63a1 + e53d674
commit df79e55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/IHP/Controller/Render.hs b/IHP/Controller/Render.hs
@@ -26,7 +26,7 @@ renderPlain text = respondAndExit $ responseLBS status200 [(hContentType, "text/
 
 {-# INLINE respondHtml #-}
 respondHtml :: (?requestContext :: RequestContext) => Html -> IO ()
-respondHtml html = respondAndExit $ responseBuilder status200 [(hContentType, "text/html"), (hConnection, "keep-alive")] (Blaze.renderHtmlBuilder html)
+respondHtml html = respondAndExit $ responseBuilder status200 [(hContentType, "text/html; charset=utf-8"), (hConnection, "keep-alive")] (Blaze.renderHtmlBuilder html)
 
 {-# INLINE respondSvg #-}
 respondSvg :: (?requestContext :: RequestContext) => Html -> IO ()

diff --git a/IHP/ModelSupport.hs b/IHP/ModelSupport.hs
@@ -31,6 +31,7 @@ import qualified Control.Newtype.Generics as Newtype
 import Control.Applicative (Const)
 import qualified GHC.Types as Type
 import qualified Data.Text as Text
+import Data.Aeson (ToJSON (..))
 
 data ModelContext = ModelContext { databaseConnection :: Connection }
 
@@ -425,3 +426,6 @@ fieldWithUpdate name model
   | cs (symbolVal name) `elem` get #touchedFields (get #meta model) =
     Update (get name model)
   | otherwise = NoUpdate name
+
+instance (ToJSON (PrimaryKey a)) => ToJSON (Id' a) where
+  toJSON (Id a) = toJSON a