Commit d0f03e1a authored by Bas Lijnse's avatar Bas Lijnse
Browse files

Added rinus's fixes for button store lifespans on the client

parent 7f4fd9d5
......@@ -337,8 +337,9 @@ getTimeAndDate hst
= ((Time time.hours time.minutes time.seconds,Date date.day date.month date.year),hst)
gForm {|HtmlTime|} (init,formid) hst
= specialize (flip mkBimapEditor {map_to = toPullDown, map_from = fromPullDown}) (init,formid <@ Page) hst
= specialize (flip mkBimapEditor {map_to = toPullDown, map_from = fromPullDown}) (init,formid <@ nPage) hst
where
nPage = if (formid.lifespan == Client) Client Page
toPullDown (Time h m s) = (hv,mv,sv)
where
hv = PullDown (1, defpixel/2) (h,[toString i \\ i <- [0..23]])
......@@ -350,8 +351,9 @@ where
convert x = toInt (toString x)
gForm {|HtmlDate|} (init,formid) hst
= specialize (flip mkBimapEditor {map_to = toPullDown, map_from = fromPullDown}) (init,formid <@ Page) hst
= specialize (flip mkBimapEditor {map_to = toPullDown, map_from = fromPullDown}) (init,formid <@ nPage) hst
where
nPage = if (formid.lifespan == Client) Client Page
toPullDown (Date d m y) = (dv,mv,yv)
where
dv = PullDown (1, defpixel/2) (md-1, [toString i \\ i <- [1..31]])
......
......@@ -11,7 +11,9 @@ import iTasksHandler, InternaliTasksCommon, iTasksBasicCombinators
import iDataSettings, iDataHandler, iDataTrivial, iDataButtons, iDataFormlib, iDataStylelib
editTaskLabel :: !String !String !a -> (Task a) | iData a
editTaskLabel tracename prompt task = \tst -> mkTask tracename ((editTask` prompt task <<@ Page) <<@ Edit) tst
editTaskLabel tracename prompt task = \tst =:{options} -> mkTask tracename ((editTask` prompt task <<@ (nPage options)) <<@ Edit) tst
where
nPage options = if (options.tasklife == Client) Client Page
editTask :: !String !a -> (Task a) | iData a
editTask prompt a = mkTask "editTask" (editTask` prompt a)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment