NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Rename Notification.event_name to event_type

Browse Source
This commit is contained in:
Jeremy Stretch 2024-07-08 14:42:56 -04:00
parent 744d3d8197
commit fa722feaf8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/api/serializers_/notifications.py
View File

@ -26,7 +26,7 @@ class NotificationSerializer(ValidatedModelSerializer):
class Meta: class Meta:
model = Notification model = Notification
fields = [ fields = [
'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', 'read', 'event_name', 'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', 'read', 'event_type',
] ]
brief_fields = ('id', 'url', 'display', 'object_type', 'object_id', 'user', 'event') brief_fields = ('id', 'url', 'display', 'object_type', 'object_id', 'user', 'event')

2
netbox/extras/events.py
View File

@ -136,7 +136,7 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
event_rule.action_object.notify( event_rule.action_object.notify(
object_type=object_type, object_type=object_type,
object_id=data['id'], object_id=data['id'],
event_name=event_type event_type=event_type
) )
else: else:

2
netbox/extras/migrations/0118_notifications.py
View File

@ -52,7 +52,7 @@ class Migration(migrations.Migration):
('created', models.DateTimeField(auto_now_add=True)), ('created', models.DateTimeField(auto_now_add=True)),
('read', models.DateTimeField(null=True)), ('read', models.DateTimeField(null=True)),
('object_id', models.PositiveBigIntegerField()), ('object_id', models.PositiveBigIntegerField()),
('event_name', models.CharField(max_length=50)), ('event_type', models.CharField(max_length=50)),
('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')), ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to=settings.AUTH_USER_MODEL)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to=settings.AUTH_USER_MODEL)),
], ],

8
netbox/extras/models/notifications.py
View File

@ -21,7 +21,7 @@ __all__ = (
) )
def get_event_name_choices(): def get_event_type_choices():
""" """
Compile a list of choices from all registered event types Compile a list of choices from all registered event types
""" """
@ -57,10 +57,10 @@ class Notification(models.Model):
ct_field='object_type', ct_field='object_type',
fk_field='object_id' fk_field='object_id'
) )
event_name = models.CharField( event_type = models.CharField(
verbose_name=_('event'), verbose_name=_('event'),
max_length=50, max_length=50,
choices=get_event_name_choices choices=get_event_type_choices
) )
objects = NotificationQuerySet.as_manager() objects = NotificationQuerySet.as_manager()
@ -104,7 +104,7 @@ class Notification(models.Model):
@cached_property @cached_property
def event(self): def event(self):
return registry['events'].get(self.event_name) return registry['events'].get(self.event_type)
class NotificationGroup(ChangeLoggedModel): class NotificationGroup(ChangeLoggedModel):

2
netbox/extras/signals.py
View File

@ -325,6 +325,6 @@ def notify_object_changed(sender, instance, created, raw, **kwargs):
# Create Notifications for Subscribers # Create Notifications for Subscribers
Notification.objects.bulk_create([ Notification.objects.bulk_create([
Notification(user_id=user, object=instance, event_name=OBJECT_UPDATED) Notification(user_id=user, object=instance, event_type=OBJECT_UPDATED)
for user in subscribed_users for user in subscribed_users
]) ])