api06: Preliminary support for diff uploading. This will not return anything

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index f4e938176c214a3d78bb83571d2cfd0400a331e8..894ab40e8613b225b625df0b076dda3702a9ee18 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -77,20 +77,11 @@ class RelationController < ApplicationController
     begin
       relation = Relation.find(params[:id])
 
     begin
       relation = Relation.find(params[:id])
 

-      if relation.visible
-        if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", params[:id]])
-          render :text => "", :status => :precondition_failed
-        else
-          relation.user_id = @user.id
-          relation.tags = []
-          relation.members = []
-          relation.visible = false
-          relation.save_with_history!
-
-          render :nothing => true
-        end
+      res = delete_internal(node)
+      unless res
+       render :text => "", :status => :precondition_failed

       else
       else

-        render :text => "", :status => :gone
+       render :text => "", :status => res

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found


@@ -99,6 +90,24 @@ class RelationController < ApplicationController
     end
   end
 
     end
   end
 

+  def delete_internal(relation)
+    if relation.visible
+      if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", params[:id]])
+       return false
+      else
+       relation.user_id = @user.id
+       relation.tags = []
+       relation.members = []
+       relation.visible = false
+       relation.save_with_history!
+
+       return :ok
+      end
+    else
+      return :gone
+    end
+  end
+

   # -----------------------------------------------------------------
   # full
   # 
   # -----------------------------------------------------------------
   # full
   #