From e405c9b746e5bb311a963b29409c72b6807b1649 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <Michael DeHaan michael@ansibleworks.com>
Date: Fri, 22 Mar 2013 18:07:06 -0400
Subject: [PATCH] Simplify some auth code, add a FIXME

---
 lib/main/models/__init__.py | 7 ++-----
 lib/main/tests.py           | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/main/models/__init__.py b/lib/main/models/__init__.py
index 89bb0bc52c..91e8fd495c 100644
--- a/lib/main/models/__init__.py
+++ b/lib/main/models/__init__.py
@@ -49,14 +49,11 @@ class CommonModel(models.Model):
             if not sub_obj.can_user_read(user, sub_obj):
                 return False
             return cls.can_user_administrate(user, obj)
-        else:
-            raise Exception("unknown relationship type: %s" % relationship)
-        return False
+        raise Exception("unknown relationship type: %s" % relationship)
  
     @classmethod
     def can_user_unattach(cls, user, obj, relationship):
-        return cls.can_user_attach(user, obj, relationship)
-
+        return cls.can_user_administrate(user, obj)
  
 class Tag(models.Model):
     ''' 
diff --git a/lib/main/tests.py b/lib/main/tests.py
index e519f68134..f4a9fcb214 100644
--- a/lib/main/tests.py
+++ b/lib/main/tests.py
@@ -298,7 +298,8 @@ class OrganizationsTest(BaseTest):
         self.post(projects7_url, a_project, expect=204, auth=self.get_super_credentials())
         projects7 = self.get(projects7_url, expect=200, auth=self.get_super_credentials())
         self.assertEquals(projects7['count'], 5)
-        
+       
+        # FIXME: need to add tests for associating and disassocating from a non-priveledged acct 
 
     def test_post_item_subobjects_users(self):
         pass