/edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()),
name='ec_edit'),
diff --git a/RIGS/views/rigboard.py b/RIGS/views/rigboard.py
index c68e1c96..d4f703cd 100644
--- a/RIGS/views/rigboard.py
+++ b/RIGS/views/rigboard.py
@@ -350,12 +350,12 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
msg = EmailMultiAlternatives(
f"{self.object.display_id} | {self.object.name} - Event Authorisation Request",
- get_template("eventauthorisation_client_request.txt").render(context),
+ get_template("email/eventauthorisation_client_request.txt").render(context),
to=[email],
reply_to=[self.request.user.email],
)
css = finders.find('css/email.css')
- html = premailer.Premailer(get_template("eventauthorisation_client_request.html").render(context),
+ html = premailer.Premailer(get_template("email/eventauthorisation_client_request.html").render(context),
external_styles=css).transform()
msg.attach_alternative(html, 'text/html')
@@ -365,7 +365,7 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
class EventAuthoriseRequestEmailPreview(generic.DetailView):
- template_name = "eventauthorisation_client_request.html"
+ template_name = "email/eventauthorisation_client_request.html"
model = models.Event
def render_to_response(self, context, **response_kwargs):
diff --git a/assets/migrations/0027_asset_nickname.py b/assets/migrations/0027_asset_nickname.py
new file mode 100644
index 00000000..630d2367
--- /dev/null
+++ b/assets/migrations/0027_asset_nickname.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2022-12-11 00:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('assets', '0026_auto_20220526_1623'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='asset',
+ name='nickname',
+ field=models.CharField(blank=True, max_length=120),
+ ),
+ ]
diff --git a/assets/models.py b/assets/models.py
index 365fd5d6..ef535fa4 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -95,7 +95,7 @@ class AssetManager(models.Manager):
def search(self, query=None):
qs = self.get_queryset()
if query is not None:
- or_lookup = (Q(asset_id__exact=query.upper()) | Q(description__icontains=query) | Q(serial_number__exact=query))
+ or_lookup = (Q(asset_id__exact=query.upper()) | Q(description__icontains=query) | Q(serial_number__exact=query) | Q(nickname__icontains=query))
qs = qs.filter(or_lookup).distinct() # distinct() is often necessary with Q lookups
return qs
@@ -125,6 +125,7 @@ class Asset(models.Model, RevisionMixin):
purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
replacement_cost = models.DecimalField(null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
comments = models.TextField(blank=True)
+ nickname = models.CharField(max_length=120, blank=True)
# Audit
last_audited_at = models.DateTimeField(blank=True, null=True)
diff --git a/assets/templates/partials/asset_detail_form.html b/assets/templates/partials/asset_detail_form.html
index 970bfce9..8b382d34 100644
--- a/assets/templates/partials/asset_detail_form.html
+++ b/assets/templates/partials/asset_detail_form.html
@@ -21,6 +21,10 @@
Description
{% render_field form.description|add_class:'form-control' value=object.description %}
+
+ Nickname
+ {% render_field form.nickname|add_class:'form-control' value=object.nickname %}
+
Category
{% render_field form.category|add_class:'form-control'%}
@@ -45,7 +49,10 @@
{% else %}
Asset ID
{{ object.asset_id }}
-
+ {% if object.nickname %}
+ Nickname
+ "{{ object.nickname }}"
+ {% endif %}
Description
{{ object.description }}
diff --git a/package-lock.json b/package-lock.json
index 1a8e9c57..a226cd96 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1930,9 +1930,9 @@
}
},
"node_modules/decode-uri-component": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
- "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"engines": {
"node": ">=0.10"
}
@@ -2232,9 +2232,9 @@
}
},
"node_modules/engine.io": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
- "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+ "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
"dev": true,
"dependencies": {
"@types/cookie": "^0.4.1",
@@ -10681,9 +10681,9 @@
}
},
"decode-uri-component": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
- "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
},
"default-compare": {
"version": "1.0.0",
@@ -10918,9 +10918,9 @@
}
},
"engine.io": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
- "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+ "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
"dev": true,
"requires": {
"@types/cookie": "^0.4.1",
diff --git a/training/urls.py b/training/urls.py
index 4fefe353..de0dd2e6 100644
--- a/training/urls.py
+++ b/training/urls.py
@@ -2,7 +2,6 @@ from django.urls import path
from django.contrib.auth.decorators import login_required
from training.decorators import is_supervisor
-from PyRIGS.decorators import permission_required_with_403
from training import views, models
from versioning.views import VersionHistory
@@ -12,10 +11,9 @@ urlpatterns = [
path('item//qualified_users/', login_required(views.ItemQualifications.as_view()), name='item_qualification'),
path('trainee/list/', login_required(views.TraineeList.as_view()), name='trainee_list'),
- path('trainee//',
- permission_required_with_403('RIGS.view_profile')(views.TraineeDetail.as_view()),
+ path('trainee//', login_required(views.TraineeDetail.as_view()),
name='trainee_detail'),
- path('trainee//history', permission_required_with_403('RIGS.view_profile')(VersionHistory.as_view()), name='trainee_history', kwargs={'model': models.Trainee, 'app': 'training'}), # Not picked up automatically because proxy model (I think)
+ path('trainee//history', login_required(VersionHistory.as_view()), name='trainee_history', kwargs={'model': models.Trainee, 'app': 'training'}), # Not picked up automatically because proxy model (I think)
path('trainee//add_qualification/', is_supervisor()(views.AddQualification.as_view()),
name='add_qualification'),
path('trainee/edit_qualification//', is_supervisor()(views.EditQualification.as_view()),