From 813ed7a7bc6f906f261deedd23d487938323fe30 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Wed, 13 Feb 2019 20:41:13 +0100 Subject: Front + api: Fix parsing of JSON-fields for switches Sort of. It's two issues at once, related: 1. API: The problem here was that the old way of updating tags simply didn't use actual JSON, but just sent "'foo','bar','baz'" as a text string. This seems dumb so I've made it send actual JSON now - just like the "placement" field. This meant updating the API. And it's not pretty, but it works. 2. Front: I've simplified nms-types a bit (hopefully to provide to simple methods: either get/set the raw value, or get/set strings. There was a bug where we sent text-encoded json instead of real json, and the reason was a confusion between when we're dealing with JSON and when we're dealing with strings. Now we are explicit. This makes the nmsEditRow-thing slightly uglier, but it needs to be fixed properly either way. In the future, we should provide renderers and editors based on types, e.g.: Placement-editor could start as a general-purpose JSON-editor, and the "switch reference" should be a drop-down.... etc. Fixes #202 --- web/api/write/switches | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'web/api/write') diff --git a/web/api/write/switches b/web/api/write/switches index e42c4b3..1f91d48 100755 --- a/web/api/write/switches +++ b/web/api/write/switches @@ -97,7 +97,9 @@ foreach my $tmp2 (@tmp) { push @dups, "not really, but: " . $switch{'placement'}; } if (defined($switch{'tags'})) { - $switch{'tags'} =~ s/'/"/g; + # MY GOD I HATE THIS + # But I'm too lazy to improve it more for now. + $switch{'tags'} = "[". join(",", map { "\"".$_."\"" } @{$switch{'tags'}})."]"; } my @set; map { -- cgit v1.2.3