Merge rails_port_0.5

[rails.git] / app / controllers / relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index efd5bf9dc37a2064cbdef16b16b8c686c96f0dde..c67b4ddf1c0f159d6ba86d10c58dc35dc3df814b 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -1,9 +1,10 @@
 class RelationController < ApplicationController
   require 'xml/libxml'
 
+  session :off
   before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :check_availability, :only => [:create, :update, :delete]
-
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
   after_filter :compress_output
 
   def create
@@ -15,12 +16,9 @@ class RelationController < ApplicationController
           render :nothing => true, :status => :precondition_failed
         else
           relation.user_id = @user.id
+          relation.save_with_history!
 
-          if relation.save_with_history
-            render :text => relation.id.to_s, :content_type => "text/plain"
-          else
-            render :text => "save error", :status => :internal_server_error
-          end
+         render :text => relation.id.to_s, :content_type => "text/plain"
         end
       else
         render :nothing => true, :status => :bad_request
@@ -61,12 +59,9 @@ class RelationController < ApplicationController
             relation.tags = new_relation.tags
             relation.members = new_relation.members
             relation.visible = true
+            relation.save_with_history!
 
-            if relation.save_with_history
-              render :nothing => true
-            else
-              render :nothing => true, :status => :internal_server_error
-            end
+            render :nothing => true
           end
         else
           render :nothing => true, :status => :bad_request
@@ -94,12 +89,9 @@ class RelationController < ApplicationController
           relation.tags = []
           relation.members = []
           relation.visible = false
+          relation.save_with_history!
 
-          if relation.save_with_history
-            render :nothing => true
-          else
-            render :nothing => true, :status => :internal_server_error
-          end
+          render :nothing => true
         end
       else
         render :nothing => true, :status => :gone