diff options
| author | tetragon <tetragon@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-10-11 15:20:17 +0000 |
|---|---|---|
| committer | tetragon <tetragon@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-10-11 15:20:17 +0000 |
| commit | 29a8ed0fe05a4b0874203c2aa5ebc0f50421b349 (patch) | |
| tree | e1f5de14886e3f79f4b83c8bc35970e49b06335e | |
| parent | 659fdf41d41a67d86eeaea1b0386aed2363240f5 (diff) | |
Fixing the output of empty fields where the label is a 'text' value in a hash
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1743 4979c152-3d1c-0410-bac9-87ea11338e46
| -rw-r--r-- | UI/form-dynatable.csv | 32 | ||||
| -rw-r--r-- | UI/form-dynatable.odst | 2 | ||||
| -rw-r--r-- | UI/form-dynatable.xlst | 2 |
3 files changed, 31 insertions, 5 deletions
diff --git a/UI/form-dynatable.csv b/UI/form-dynatable.csv index 9b65baba..d7691bf4 100644 --- a/UI/form-dynatable.csv +++ b/UI/form-dynatable.csv @@ -1,3 +1,29 @@ -<?lsmb FOREACH column IN columns ?><?lsmb IF heading.$column.text; heading.$column.text; ELSE; heading.$column; END ?><?lsmb IF NOT loop.last ?>,<?lsmb END ?><?lsmb END ?> -<?lsmb FOREACH row IN rows ?><?lsmb FOREACH column IN columns ?><?lsmb IF row.$column.text; row.$column.text; ELSE; row.$column; END ?><?lsmb IF NOT loop.last ?>,<?lsmb END ?><?lsmb END ?> -<?lsmb END ?><?lsmb IF totals; t = []; FOREACH column IN columns; t.push(totals.$column); END; t.join(','); END ?> +<?lsmb FOREACH column IN columns; + IF heading.$column.text; + heading.$column.text; + ELSE; + heading.$column; + END; + IF NOT loop.last + ?>,<?lsmb + END; +END ?> +<?lsmb FOREACH row IN rows; + FOREACH column IN columns; + IF row.$column.text.defined; + row.$column.text; + ELSE; + row.$column; + END; + IF NOT loop.last + ?>,<?lsmb + END; + END ?> +<?lsmb END; +IF totals; + t = []; + FOREACH column IN columns; + t.push(totals.$column); + END; + t.join(','); +END ?> diff --git a/UI/form-dynatable.odst b/UI/form-dynatable.odst index 7a4cdfdc..30badba3 100644 --- a/UI/form-dynatable.odst +++ b/UI/form-dynatable.odst @@ -17,7 +17,7 @@ <?lsmb FOREACH column IN columns ?> <?lsmb IF loop.first ?><format num_format="3"> <?lsmb END ?> - <?lsmb IF row.$column.href ?> + <?lsmb IF row.$column.text.defined ?> <italic> <cell text="<?lsmb row.$column.text ?>" /> </italic> diff --git a/UI/form-dynatable.xlst b/UI/form-dynatable.xlst index 7c00fb67..9e71bf54 100644 --- a/UI/form-dynatable.xlst +++ b/UI/form-dynatable.xlst @@ -11,7 +11,7 @@ <?lsmb FOREACH row IN rows ?> <row> <?lsmb FOREACH column IN columns ?> - <?lsmb IF row.$column.href ?> + <?lsmb IF row.$column.text.defined ?> <cell text="<?lsmb row.$column.text ?>" /> <?lsmb ELSE ?> <cell text="<?lsmb row.$column ?>" /> |