diff --git a/RIGS/management/commands/generateSampleData.py b/RIGS/management/commands/generateSampleData.py index 5263a030..e17e2ff4 100644 --- a/RIGS/management/commands/generateSampleData.py +++ b/RIGS/management/commands/generateSampleData.py @@ -121,8 +121,8 @@ class Command(BaseCommand): self.keyholder_group = Group.objects.create(name='Keyholders') self.finance_group = Group.objects.create(name='Finance') - keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue"] - financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person"] + keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue", "add_asset", "change_asset", "delete_asset", "asset_finance"] + financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person", "asset_finance", "change_asset"] for permId in keyholderPerms: self.keyholder_group.permissions.add(Permission.objects.get(codename=permId)) diff --git a/assets/migrations/0012_auto_20191014_0012.py b/assets/migrations/0012_auto_20191014_0012.py new file mode 100644 index 00000000..fdff40bb --- /dev/null +++ b/assets/migrations/0012_auto_20191014_0012.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.13 on 2019-10-13 23:12 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('assets', '0011_auto_20191013_2247'), + ] + + operations = [ + migrations.AlterModelOptions( + name='asset', + options={'permissions': (('asset_finance', 'Can see financial data for assets'),)}, + ), + ] diff --git a/assets/models.py b/assets/models.py index 66646515..a43dc839 100644 --- a/assets/models.py +++ b/assets/models.py @@ -49,7 +49,11 @@ class Connector(models.Model): class Asset(models.Model): - + class Meta: + permissions = ( + ('asset_finance', 'Can see financial data for assets'), + ) + parent = models.ForeignKey(to='self', related_name='asset_parent', blank=True, null=True, on_delete=models.SET_NULL) asset_id = models.CharField(max_length=10, unique=True) description = models.CharField(max_length=120) diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html index 6c0159bc..e4cbaa6f 100644 --- a/assets/templates/asset_update.html +++ b/assets/templates/asset_update.html @@ -32,9 +32,11 @@