1
0
mirror of https://github.com/peeringdb/peeringdb.git synced 2024-05-11 05:55:09 +00:00

Support 202010 (#868)

* Add migrations for 463_745_775

* Black format the migration

* Bump up django_peeringdb version

* api require django-peeringdb 2.3.0.1 and later

* Set timezone to utc throughout sponsorship notifications

* Add government net type to existing migrtion

* Remove ixlan from peers at this exchange point

* Add new migration

* add backward migrtion

* Search on user__username not user object

* Black those changes

* Fix local erro bug

* Add test and fix speed update for deleted netixlan

* Handle attribute error

* Change language in email to reflect we don't email after x days

* Comment out EnvironmentSetting in django admin

* Disable the followup ticket and modify tests to correct deskproticket assertions

* exclude ixf tickets from deskpro publishing

* Add failing mock deskpro api and write a test with it

* Add anchor tags to notify-ixf-add

* a tags for conflict insert

* a tags for consolidated

* a tags modify

* a tags protocol conflict

* a tags remote changes

* a tags for remove

* a tags for resolved

* a tags source error

* Add target blank

* Add comment

* fix unhandled deskpro api errors

* Add mail attachment

* Remove strip_tags

* readd some strip_tags

* add explicit order for fields in admin control panel #861

* revert pretty_speed change

* Coerce is_rs_peer and operational to bool

* black formatted

* pipfile relock

Co-authored-by: Elliot Frank <elliot@20c.com>
Co-authored-by: Stefan Pratter <stefan@20c.com>
This commit is contained in:
Matt Griswold
2020-11-04 00:26:15 +00:00
committed by GitHub
parent 3c412a8c8c
commit 16285c13f3
24 changed files with 777 additions and 237 deletions

View File

@@ -853,6 +853,26 @@ class OrganizationAdmin(ModelAdminWithVQCtrl, SoftDeleteAdmin):
readonly_fields = ("id", "nsp_namespace")
form = StatusForm
fields = [
"status",
"name",
"address1",
"address2",
"city",
"state",
"zipcode",
"country",
"latitude",
"longitude",
"website",
"notes",
"logo",
"verification_queue",
"version",
"id",
"nsp_namespace",
]
def get_urls(self):
urls = super().get_urls()
my_urls = [
@@ -966,6 +986,36 @@ class FacilityAdmin(ModelAdminWithVQCtrl, SoftDeleteAdmin):
NetworkFacilityInline,
)
fields = [
"status",
"name",
"address1",
"address2",
"city",
"state",
"zipcode",
"country",
"latitude",
"longitude",
"website",
"clli",
"rencode",
"npanxx",
"tech_email",
"tech_phone",
"sales_email",
"sales_phone",
"notes",
"geocode_status",
"geocode_date",
"geocode_error",
"org",
"verification_queue",
"version",
"id",
"nsp_namespace",
]
class NetworkAdminForm(StatusForm):
@@ -1184,8 +1234,17 @@ class VerificationQueueAdmin(ModelAdminWithUrlActions):
class UserOrgAffiliationRequestAdmin(ModelAdminWithUrlActions):
list_display = ("user", "asn", "org", "created", "status")
search_fields = ("user", "asn")
list_display = (
"user",
"asn",
"org",
"created",
"status",
)
search_fields = (
"user__username",
"asn",
)
readonly_fields = ("created",)
raw_id_fields = ("user", "org")
@@ -1854,7 +1913,8 @@ class EnvironmentSettingAdmin(admin.ModelAdmin):
return obj.set_value(form.cleaned_data["value"])
admin.site.register(EnvironmentSetting, EnvironmentSettingAdmin)
# Commented out via issue #860
# admin.site.register(EnvironmentSetting, EnvironmentSettingAdmin)
admin.site.register(IXFMemberData, IXFMemberDataAdmin)
admin.site.register(Facility, FacilityAdmin)
admin.site.register(InternetExchange, InternetExchangeAdmin)