mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-11-04 15:15:42 +00:00 
			
		
		
		
	merge fixes
This commit is contained in:
		@@ -23,12 +23,6 @@ class WebhookAdmin(ImportExportModelAdmin):
 | 
				
			|||||||
    list_display = ('endpoint_id', 'name', 'active', 'user')
 | 
					    list_display = ('endpoint_id', 'name', 'active', 'user')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
admin.site.register(common.models.InvenTreeSetting, SettingsAdmin)
 | 
					 | 
				
			||||||
admin.site.register(common.models.InvenTreeUserSetting, UserSettingsAdmin)
 | 
					 | 
				
			||||||
admin.site.register(common.models.WebhookEndpoint, WebhookAdmin)
 | 
					 | 
				
			||||||
admin.site.register(common.models.WebhookMessage, ImportExportModelAdmin)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class NotificationEntryAdmin(admin.ModelAdmin):
 | 
					class NotificationEntryAdmin(admin.ModelAdmin):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    list_display = ('key', 'uid', 'updated', )
 | 
					    list_display = ('key', 'uid', 'updated', )
 | 
				
			||||||
@@ -36,4 +30,6 @@ class NotificationEntryAdmin(admin.ModelAdmin):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
admin.site.register(common.models.InvenTreeSetting, SettingsAdmin)
 | 
					admin.site.register(common.models.InvenTreeSetting, SettingsAdmin)
 | 
				
			||||||
admin.site.register(common.models.InvenTreeUserSetting, UserSettingsAdmin)
 | 
					admin.site.register(common.models.InvenTreeUserSetting, UserSettingsAdmin)
 | 
				
			||||||
 | 
					admin.site.register(common.models.WebhookEndpoint, WebhookAdmin)
 | 
				
			||||||
 | 
					admin.site.register(common.models.WebhookMessage, ImportExportModelAdmin)
 | 
				
			||||||
admin.site.register(common.models.NotificationEntry, NotificationEntryAdmin)
 | 
					admin.site.register(common.models.NotificationEntry, NotificationEntryAdmin)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user