Fix projects index/show api to return json object (for json format) and string (for xml format)

Author: sanak

app/views/projects/index.api.rsb

@@ -11,9 +11,9 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
 
       if @include_geometry
         if project.geom
-          api.geojson project.geojson.to_json
+          api.geojson (params[:format] == "json") ? project.geojson : project.geojson.to_json
         else
-          api.geojson ""
+          api.geojson nil
         end
       end
 

app/views/projects/show.api.rsb

@@ -9,9 +9,9 @@ api.project do
   api.is_public   @project.is_public?
 
   if @project.geom
-    api.geojson @project.geojson.to_json
+    api.geojson (params[:format] == "json") ? @project.geojson : @project.geojson.to_json
   else
-    api.geojson ""
+    api.geojson nil
   end
 
   render_api_custom_values @project.visible_custom_field_values, api

test/integration/projects_api_test.rb

@@ -82,7 +82,7 @@ class ProjectsApiTest < Redmine::IntegrationTest
     get '/projects.json?include=geometry'
     assert_response :success
     assert json = JSON.parse(@response.body)
-    hsh = JSON.parse json['projects'].detect{|p|p['id'] == @project.id}['geojson']
+    hsh = json['projects'].detect{|p|p['id'] == @project.id}['geojson']
     assert_equal geo['geometry'], hsh['geometry']
   end