Move changeset builder views to the api namespace

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index 9ecd22b456493dde5e2efcca96df383fb63e9d3d..0bebce433666f5d7d0fbbfa4854517c3b281efdf 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -42,7 +42,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
-      render "changesets/changeset"
+      render "api/changesets/changeset"
     end
 
     ##
@@ -62,7 +62,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
-      render "changesets/changeset"
+      render "api/changesets/changeset"
     end
 
     ##
@@ -82,7 +82,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
-      render "changesets/changeset"
+      render "api/changesets/changeset"
     end
   end
 end

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 92690a75ec36f671a8ee34178899b4d7c74e98a8..dd43f7ed0943e59829d3902ee2142717eb200bb8 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -43,7 +43,7 @@ module Api
     def show
       @changeset = Changeset.find(params[:id])
       @include_discussion = params[:include_discussion].presence
-      render "changesets/changeset"
+      render "changeset"
     end
 
     ##
@@ -105,7 +105,7 @@ module Api
       # will include the bigger bounding box.
       cs.save!
       @changeset = cs
-      render "changesets/changeset"
+      render "changeset"
     end
 
     ##
@@ -222,7 +222,7 @@ module Api
 
       # preload users, tags and comments, and render result
       @changesets = changesets.preload(:user, :changeset_tags, :comments)
-      render "changesets/changesets"
+      render "changesets"
     end
 
     ##
@@ -242,7 +242,7 @@ module Api
 
       check_changeset_consistency(@changeset, current_user)
       @changeset.update_from(new_changeset, current_user)
-      render "changesets/changeset"
+      render "changeset"
     end
 
     ##
@@ -263,7 +263,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
-      render "changesets/changeset"
+      render "changeset"
     end
 
     ##
@@ -284,7 +284,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
-      render "changesets/changeset"
+      render "changeset"
     end
 
     private

diff --git a/app/views/changesets/_changeset.builder b/app/views/api/changesets/_changeset.builder
similarity index 100%
rename from app/views/changesets/_changeset.builder
rename to app/views/api/changesets/_changeset.builder

diff --git a/app/views/changesets/changeset.builder b/app/views/api/changesets/changeset.builder
similarity index 52%
rename from app/views/changesets/changeset.builder
rename to app/views/api/changesets/changeset.builder
index a2faaac9f7f5455baade48e93eda0ace32efaa53..e8da4006f531b71349b32831c03f2f2036ba87f8 100644 (file)
--- a/app/views/changesets/changeset.builder
+++ b/app/views/api/changesets/changeset.builder
@@ -3,5 +3,5 @@ xml.instruct! :xml, :version => "1.0"
 # basic attributes
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
-  osm << render(:partial => "changesets/changeset.builder", :locals => { :changeset => @changeset })
+  osm << render(:partial => "api/changesets/changeset.builder", :locals => { :changeset => @changeset })
 end

diff --git a/app/views/changesets/changesets.builder b/app/views/api/changesets/changesets.builder
similarity index 59%
rename from app/views/changesets/changesets.builder
rename to app/views/api/changesets/changesets.builder
index 80037e4b70148edd1b26c9d9c9e83cfc5fb7a592..ab7064f20abd3f7dd4d9054f3bd77642350bd352 100644 (file)
--- a/app/views/changesets/changesets.builder
+++ b/app/views/api/changesets/changesets.builder
@@ -4,6 +4,6 @@ xml.instruct! :xml, :version => "1.0"
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
   @changesets.each do |changeset|
-     osm << render(:partial => "changesets/changeset.builder", :locals => { :changeset => changeset })
+     osm << render(:partial => "api/changesets/changeset.builder", :locals => { :changeset => changeset })
   end
 end