diff options
| author | Sebastian Reichel <sre@ring0.de> | 2013-03-26 16:14:34 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2013-03-26 16:14:34 +0100 |
| commit | c7330792abfd7265faf4047039dd9bf5a24e5633 (patch) | |
| tree | a45b7ddc9e512172291928515dd327f3f382ecff /src/web/web.vala | |
| parent | 7bfb48ef84384ff0460f273ea5841fba628d2a46 (diff) | |
| parent | 88899c833223608e51102d7c7a61afdf62b12d4c (diff) | |
| download | serial-barcode-scanner-c7330792abfd7265faf4047039dd9bf5a24e5633.tar.bz2 | |
fix merge conflict
Diffstat (limited to 'src/web/web.vala')
| -rw-r--r-- | src/web/web.vala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/web/web.vala b/src/web/web.vala index 9dfb1ae..1c0d9b7 100644 --- a/src/web/web.vala +++ b/src/web/web.vala @@ -441,9 +441,7 @@ public class WebServer { string table = ""; foreach(var e in db.get_stock()) { - table += "<tr><td><a href=\"/products/%s\">%s</a></td><td><a href=\"/products/%s\">%s</a></td><td>%d</td><td>%s€</td><td>%s€</td></tr>".printf( - e.id, e.id, e.id, e.name, e.amount, e.memberprice, e.guestprice - ); + table += @"<tr><td><a href=\"/products/$(e.id)\">$(e.id)</a></td><td><a href=\"/products/$(e.id)\">$(e.name)</a></td><td>$(e.amount)</td><td>$(e.memberprice)€</td><td>$(e.guestprice)€</td></tr>"; } t.replace("DATA", table); |