From b39f835a38ca848c847ff12814de48a2cab7bb71 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Thu, 17 Oct 2019 20:54:39 +0100
Subject: [PATCH] Fixed asset permissions

---
 .gitignore                                    |  2 +-
 .../commands/generateSampleRIGSData.py        | 11 ++++------
 assets/migrations/0014_auto_20191017_2052.py  | 21 +++++++++++++++++++
 assets/models.py                              |  7 +++++++
 4 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 assets/migrations/0014_auto_20191017_2052.py

diff --git a/.gitignore b/.gitignore
index 2a3fd944..041dcbd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,4 +108,4 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
-.vscode/launch.json
+.vscode/
\ No newline at end of file
diff --git a/RIGS/management/commands/generateSampleRIGSData.py b/RIGS/management/commands/generateSampleRIGSData.py
index 3c82fe57..5f2c91a4 100644
--- a/RIGS/management/commands/generateSampleRIGSData.py
+++ b/RIGS/management/commands/generateSampleRIGSData.py
@@ -127,13 +127,10 @@ class Command(BaseCommand):
                           "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"]
+                          "asset_finance", "view_asset", "view_supplier", "asset_finance", 
+                          "add_supplier"]
+        financePerms = keyholderPerms + ["add_invoice", "change_invoice", "view_invoice",
+                        "add_payment", "change_payment", "delete_payment"]
 
         for permId in keyholderPerms:
             self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
diff --git a/assets/migrations/0014_auto_20191017_2052.py b/assets/migrations/0014_auto_20191017_2052.py
new file mode 100644
index 00000000..80437804
--- /dev/null
+++ b/assets/migrations/0014_auto_20191017_2052.py
@@ -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'),)},
+        ),
+    ]
diff --git a/assets/models.py b/assets/models.py
index a25b579f..30dda335 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -33,6 +33,12 @@ class AssetStatus(models.Model):
 class Supplier(models.Model):
     name = models.CharField(max_length=80)
 
+    
+    class Meta:
+        permissions = (
+            ('view_supplier', 'Can view a supplier'),
+        )
+
     def get_absolute_url(self):
         return reverse('supplier_list')
 
@@ -55,6 +61,7 @@ class Asset(models.Model):
         ordering = ['asset_id']
         permissions = (
             ('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)