External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 08:37:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Added auto_generated flag for RolePermissions

Browse Source
This commit is contained in:
Akita Noek
2016-03-15 13:36:28 -04:00
parent ea9642f5df
commit b499555be4
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/fields.py
View File

@@ -126,7 +126,8 @@ class ImplicitRoleDescriptor(ReverseSingleRelatedObjectDescriptor):
if self.permissions is not None: if self.permissions is not None:
permissions = RolePermission( permissions = RolePermission(
role=role, role=role,
resource=instance resource=instance,
auto_generated=True
) )
if 'all' in self.permissions and self.permissions['all']: if 'all' in self.permissions and self.permissions['all']:

1
awx/main/migrations/0006_v300_rbac_changes.py
View File

@@ -63,6 +63,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('created', models.DateTimeField(default=None, editable=False)), ('created', models.DateTimeField(default=None, editable=False)),
('modified', models.DateTimeField(default=None, editable=False)), ('modified', models.DateTimeField(default=None, editable=False)),
('auto_generated', models.BooleanField(default=False)),
('object_id', models.PositiveIntegerField(default=None)), ('object_id', models.PositiveIntegerField(default=None)),
('create', models.IntegerField(default=0)), ('create', models.IntegerField(default=0)),
('read', models.IntegerField(default=0)), ('read', models.IntegerField(default=0)),

1
awx/main/models/rbac.py
View File

@@ -160,6 +160,7 @@ class RolePermission(CreatedModifiedModel):
content_type = models.ForeignKey(ContentType, null=False, default=None) content_type = models.ForeignKey(ContentType, null=False, default=None)
object_id = models.PositiveIntegerField(null=False, default=None) object_id = models.PositiveIntegerField(null=False, default=None)
resource = GenericForeignKey('content_type', 'object_id') resource = GenericForeignKey('content_type', 'object_id')
auto_generated = models.BooleanField(default=False)
create = models.IntegerField(default = 0) create = models.IntegerField(default = 0)
read = models.IntegerField(default = 0) read = models.IntegerField(default = 0)

1
awx/main/signals.py
View File

@@ -133,6 +133,7 @@ def create_user_role(instance, **kwargs):
RolePermission.objects.create( RolePermission.objects.create(
role = role, role = role,
resource = instance, resource = instance,
auto_generated = True,
create=1, read=1, write=1, delete=1, update=1, create=1, read=1, write=1, delete=1, update=1,
execute=1, scm_update=1, use=1, execute=1, scm_update=1, use=1,
) )