summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Handler/Common.hs12
-rw-r--r--bar.cabal2
-rw-r--r--bar.nix2
3 files changed, 7 insertions, 9 deletions
diff --git a/Handler/Common.hs b/Handler/Common.hs
index 776d6ff..87496cb 100644
--- a/Handler/Common.hs
+++ b/Handler/Common.hs
@@ -16,8 +16,6 @@ module Handler.Common
16 16
17import Import hiding ((\\)) 17import Import hiding ((\\))
18 18
19import Data.Unique
20
21import qualified Data.Text as Text 19import qualified Data.Text as Text
22import qualified Data.ByteString.Char8 as CBS 20import qualified Data.ByteString.Char8 as CBS
23 21
@@ -102,9 +100,9 @@ itemForm proto identView = do
102 100
103 let mWhen = bool (Nothing <$) (fmap Just) 101 let mWhen = bool (Nothing <$) (fmap Just)
104 102
105 neverBoxId <- ("check" <>) . show . hashUnique <$> liftIO newUnique 103 neverBoxId <- newIdent
106 unknownBoxId <- ("check" <>) . show . hashUnique <$> liftIO newUnique 104 unknownBoxId <- newIdent
107 groupId <- ("dateGroup" <>) . show . hashUnique <$> liftIO newUnique 105 groupId <- newIdent
108 106
109 dNever <- mWhen dfNever $ 107 dNever <- mWhen dfNever $
110 mopt checkBoxField ("" { fsId = Just $ Text.pack neverBoxId }) . Just . Just . fromMaybe True $ fmap isNever proto 108 mopt checkBoxField ("" { fsId = Just $ Text.pack neverBoxId }) . Just . Just . fromMaybe True $ fmap isNever proto
@@ -202,12 +200,12 @@ typedKindField :: (Widget -> Widget -> Widget) -- ^ `\kindWidget typeWidget -> _
202 -> (Maybe Text, Maybe Text) -- ^ `(kindProto, typeProto)` 200 -> (Maybe Text, Maybe Text) -- ^ `(kindProto, typeProto)`
203 -> MForm Handler ((FormResult Text, FormResult Text), Widget) -- ^ `((kindRes, typeRes), typedKindWidget)` 201 -> MForm Handler ((FormResult Text, FormResult Text), Widget) -- ^ `((kindRes, typeRes), typedKindWidget)`
204typedKindField collate (kindProto, typeProto) = do 202typedKindField collate (kindProto, typeProto) = do
205 tOptionId <- ("options" <>) . tshow . hashUnique <$> liftIO newUnique 203 tOptionId <- newIdent
206 let 204 let
207 tAttrs = [ ("list", tOptionId) 205 tAttrs = [ ("list", tOptionId)
208 , ("autocomplete", "off") 206 , ("autocomplete", "off")
209 ] 207 ]
210 kOptionId <- ("options" <>) . tshow . hashUnique <$> liftIO newUnique 208 kOptionId <- newIdent
211 let 209 let
212 kAttrs = [ ("list", kOptionId) 210 kAttrs = [ ("list", kOptionId)
213 , ("autocomplete", "off") 211 , ("autocomplete", "off")
diff --git a/bar.cabal b/bar.cabal
index 8840818..13e47d1 100644
--- a/bar.cabal
+++ b/bar.cabal
@@ -1,5 +1,5 @@
1name: bar 1name: bar
2version: 0.6.3 2version: 0.6.4
3cabal-version: >= 1.8 3cabal-version: >= 1.8
4build-type: Simple 4build-type: Simple
5 5
diff --git a/bar.nix b/bar.nix
index f0617bd..1b690db 100644
--- a/bar.nix
+++ b/bar.nix
@@ -10,7 +10,7 @@
10}: 10}:
11mkDerivation { 11mkDerivation {
12 pname = "bar"; 12 pname = "bar";
13 version = "0.6.3"; 13 version = "0.6.4";
14 src = ./.; 14 src = ./.;
15 isLibrary = true; 15 isLibrary = true;
16 isExecutable = true; 16 isExecutable = true;