[Jifty-commit] r4739 - in jifty/trunk: share/web/templates/__jifty/webservices

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Tue Dec 18 20:12:10 2007
New Revision: 4739

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/share/web/templates/__jifty/webservices/json
   jifty/trunk/share/web/templates/__jifty/webservices/yaml

Log:
 r49197 at onn:  sartak | 2007-12-18 20:11:39 -0500
 Make the json and yaml webservices use Result->from_hash


Modified: jifty/trunk/share/web/templates/__jifty/webservices/json
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/webservices/json	(original)
+++ jifty/trunk/share/web/templates/__jifty/webservices/json	Tue Dec 18 20:12:10 2007
@@ -1,2 +1,13 @@
 % $r->content_type("text/x-json");
-<% Jifty::JSON::objToJson({Jifty->web->response->results}) |n%>
+<% Jifty::JSON::objToJson(\%results) |n%>
+
+<%INIT>
+my %results = Jifty->web->response->results;
+for (values %results) {
+    $_ = $_->as_hash;
+
+    # backwards compatibility :(
+    $_->{_content} = delete $_->{content};
+}
+</%INIT>
+

Modified: jifty/trunk/share/web/templates/__jifty/webservices/yaml
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/webservices/yaml	(original)
+++ jifty/trunk/share/web/templates/__jifty/webservices/yaml	Tue Dec 18 20:12:10 2007
@@ -1,2 +1,13 @@
 % $r->content_type("text/x-yaml");
-<% Jifty::YAML::Dump({Jifty->web->response->results}) |n%>
+<% Jifty::YAML::Dump(\%results) |n%>
+
+<%INIT>
+my %results = Jifty->web->response->results;
+for (values %results) {
+    $_ = $_->as_hash;
+
+    # backwards compatibility :(
+    $_->{_content} = delete $_->{content};
+}
+</%INIT>
+