Switched back to multiple-organizations for Projects

awx/main/models/projects.py

@@ -196,14 +196,6 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
         app_label = 'main'
         ordering = ('id',)
 
-    organization = models.ForeignKey(
-        'Organization',
-        blank=False,
-        null=True,
-        on_delete=models.SET_NULL,
-        related_name='project_list', # TODO: this should eventually be refactored
-                                     # back to 'projects' - anoek 2016-01-28
-    )
     scm_delete_on_next_update = models.BooleanField(
         default=False,
         editable=False,
@@ -217,13 +209,13 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
     )
     admin_role = ImplicitRoleField(
         role_name='Project Administrator',
-        parent_role='organization.admin_role',
+        parent_role='organizations.admin_role',
         resource_field='resource',
         permissions = {'all': True}
     )
     auditor_role = ImplicitRoleField(
         role_name='Project Auditor',
-        parent_role='organization.auditor_role',
+        parent_role='organizations.auditor_role',
         resource_field='resource',
         permissions = {'read': True}
     )