Mercurial > urweb
diff demo/more/dbgrid.ur @ 946:2412cb10c97c
Filters displaying properly
| author | Adam Chlipala <adamc@hcoop.net> |
|---|---|
| date | Tue, 15 Sep 2009 16:27:24 -0400 |
| parents | da3ec6014d2f |
| children | 8c37699de273 |
line wrap: on
line diff
--- a/demo/more/dbgrid.ur Tue Sep 15 16:06:12 2009 -0400 +++ b/demo/more/dbgrid.ur Tue Sep 15 16:27:24 2009 -0400 @@ -109,7 +109,11 @@ Parse = fn s => v <- signal s; return (m.Parse v), CreateFilter = source m.CreateFilter, DisplayFilter = m.DisplayFilter, - Filter = fn f v => f <- signal f; return (m.Filter f v)}, + Filter = fn f v => f <- signal f; + return (if m.FilterIsNull f then + True + else + m.Filter f v)}, {Display = fn s => <xml><dyn signal={v <- signal s; return (m.Display v)}/></xml>, Edit = m.Edit, Initialize = fn v => source (case v of @@ -126,7 +130,7 @@ DisplayFilter = m.DisplayFilter, Filter = fn f v => f <- signal f; return (if m.FilterIsNull f then - Option.isNone v + True else case v of None => False @@ -143,13 +147,13 @@ type intFilter = basicFilter string val int : meta (intGlobal, int, intInput, intFilter) = basic {Display = fn s => <xml>{[s]}</xml>, - Edit = fn s => <xml><ctextbox source={s}/></xml>, + Edit = fn s => <xml><ctextbox size={5} source={s}/></xml>, Initialize = fn n => show n, InitializeNull = "", IsNull = eq "", Parse = fn v => read v, CreateFilter = "", - DisplayFilter = fn s => <xml><ctextbox source={s}/></xml> : xbody, + DisplayFilter = fn s => <xml><ctextbox size={5} source={s}/></xml> : xbody, Filter = fn s n => case read s of None => True