mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-21 07:22:14 +00:00
Fixed asset permissions
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -108,4 +108,4 @@ atlassian-ide-plugin.xml
|
|||||||
com_crashlytics_export_strings.xml
|
com_crashlytics_export_strings.xml
|
||||||
crashlytics.properties
|
crashlytics.properties
|
||||||
crashlytics-build.properties
|
crashlytics-build.properties
|
||||||
.vscode/launch.json
|
.vscode/
|
||||||
@@ -127,13 +127,10 @@ class Command(BaseCommand):
|
|||||||
"add_person", "change_person", "view_person", "view_profile",
|
"add_person", "change_person", "view_person", "view_profile",
|
||||||
"add_venue", "change_venue", "view_venue",
|
"add_venue", "change_venue", "view_venue",
|
||||||
"add_asset", "change_asset", "delete_asset",
|
"add_asset", "change_asset", "delete_asset",
|
||||||
"asset_finance"]
|
"asset_finance", "view_asset", "view_supplier", "asset_finance",
|
||||||
financePerms = ["change_event", "view_event", "add_eventitem",
|
"add_supplier"]
|
||||||
"change_eventitem", "add_invoice", "change_invoice", "view_invoice",
|
financePerms = keyholderPerms + ["add_invoice", "change_invoice", "view_invoice",
|
||||||
"add_organisation", "change_organisation", "view_organisation",
|
"add_payment", "change_payment", "delete_payment"]
|
||||||
"add_payment", "change_payment", "delete_payment",
|
|
||||||
"add_person", "change_person", "view_person",
|
|
||||||
"asset_finance", "change_asset"]
|
|
||||||
|
|
||||||
for permId in keyholderPerms:
|
for permId in keyholderPerms:
|
||||||
self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
|
self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
|
||||||
|
|||||||
21
assets/migrations/0014_auto_20191017_2052.py
Normal file
21
assets/migrations/0014_auto_20191017_2052.py
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# Generated by Django 2.0.13 on 2019-10-17 19:52
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('assets', '0013_auto_20191016_1446'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='asset',
|
||||||
|
options={'ordering': ['asset_id'], 'permissions': (('asset_finance', 'Can see financial data for assets'), ('view_asset', 'Can view an asset'))},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='supplier',
|
||||||
|
options={'permissions': (('view_supplier', 'Can view a supplier'),)},
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -33,6 +33,12 @@ class AssetStatus(models.Model):
|
|||||||
class Supplier(models.Model):
|
class Supplier(models.Model):
|
||||||
name = models.CharField(max_length=80)
|
name = models.CharField(max_length=80)
|
||||||
|
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
permissions = (
|
||||||
|
('view_supplier', 'Can view a supplier'),
|
||||||
|
)
|
||||||
|
|
||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
return reverse('supplier_list')
|
return reverse('supplier_list')
|
||||||
|
|
||||||
@@ -55,6 +61,7 @@ class Asset(models.Model):
|
|||||||
ordering = ['asset_id']
|
ordering = ['asset_id']
|
||||||
permissions = (
|
permissions = (
|
||||||
('asset_finance', 'Can see financial data for assets'),
|
('asset_finance', 'Can see financial data for assets'),
|
||||||
|
('view_asset', 'Can view an asset')
|
||||||
)
|
)
|
||||||
|
|
||||||
parent = models.ForeignKey(to='self', related_name='asset_parent', blank=True, null=True, on_delete=models.SET_NULL)
|
parent = models.ForeignKey(to='self', related_name='asset_parent', blank=True, null=True, on_delete=models.SET_NULL)
|
||||||
|
|||||||
Reference in New Issue
Block a user