mirror of
https://github.com/peeringdb/peeringdb.git
synced 2024-05-11 05:55:09 +00:00
Fix typos1 conflicts resolved (#842)
* Update 0006_network_allow_ixp_update.py fixes 'Sepcifies' typo in 0006_network_allow_ixp_update.py * Update 0029_auto_20200401_1006.py fixes 'Sepcifies' typo in 0029_auto_20200401_1006.py * Update models.py fixes 'Sepcifies' typo in models.py * Update org_admin_views.py fixes 'afiliation' typos in org_admin_views.py * Update serializers.py fix use of "it's" when it should instead be "its" in 'serializers.py' * Update 0004_geocode_fields.py correct use of "it's" to be "its" in '0004_geocode_fields.py', also fix spelling of 'syncronized' * Update 0029_auto_20200401_1006.py correct use of "it's" to be "its" in '0029_auto_20200401_1006.py', also fix spelling of 'syncronized' * Update models.py correct use of "it's" to be "its" in 'models.py', also fix spelling of 'syncronized' * Update email_confirm.html correct 're-initate' in email_confirm.html * Update notify-pdb-admin-user-affil.txt correct 'organzation' in 'notify-pdb-admin-user-affil.txt' * Update op_create.md correct 'organzation' in 'ip_create.md' * Update notify-pdb-admin-asnauto-skipvq.txt correct 'organzation' in 'notify-pdb-admin-asnauto-skipvq.txt' * Update models.py correct 'organzation' in 'models.py' * Update notify-pdb-admin-asnauto-skipvq.txt fix 'succesfully' in 'notify-pdb-admin-asnauto-skipvq.txt' * Update views.py fix 'succesfully' in 'views.py' * Update pdb_migrate_ixlans.py * Update models.py several more replacements of "it's" with "its" * Update rest.py one more replacement of "it's" with "its" * Update op_retrieve.md replace "dont" with "don't" * Update notify-org-admin-merge.txt fix "dont" with "don't" * Update error.html fix "dont" with "don't" * Update op_list.md fix "dont" with "don't" * Update serializers.py fix "dont" with "don't" * Update deskpro.py fix "dont" with "don't" * Update mock.py fix "dont" with "don't" * Update ixf.py fix "dont" with "don't" * Update admin.py fix "dont" with "don't" * Update api_schema.py fix "dont" with "don't" * Update signals.py fix "dont" with "don't" * Update views.py fix "dont" with "don't" * Update test_admin.py fix "dont" with "don't" * Update pdb_api_test.py fix "dont" with "don't" * Update models.py fix "dont" with "don't" * revert to "IXP" in help text Co-authored-by: Theo Baschak <tbaschak@users.noreply.github.com> Co-authored-by: Stefan Pratter <stefan@20c.com>
This commit is contained in:
@@ -921,7 +921,7 @@ def view_organization(request, id):
|
||||
)
|
||||
|
||||
# if the organization being viewed is the one used
|
||||
# to store suggested entities, we dont want to show the editorial
|
||||
# to store suggested entities, we don't want to show the editorial
|
||||
# tools
|
||||
if org.id == dj_settings.SUGGEST_ENTITY_ORG:
|
||||
perms["can_create"] = False
|
||||
@@ -931,7 +931,7 @@ def view_organization(request, id):
|
||||
perms["can_delete_%s" % tag] = False
|
||||
|
||||
# if user has writing perms to entity, we want to load sub entities
|
||||
# that have status pending so we dont use the ones kicked back
|
||||
# that have status pending so we don't use the ones kicked back
|
||||
# by the serializer
|
||||
if perms.get("can_delete_ix") or perms.get("can_create_ix"):
|
||||
exchanges = org.ix_set.filter(status__in=["ok", "pending"])
|
||||
@@ -1457,7 +1457,7 @@ def view_network(request, id):
|
||||
.order_by("ixlan__ix__name")
|
||||
)
|
||||
|
||||
# This will be passed as default value for keys that dont exist - causing
|
||||
# This will be passed as default value for keys that don't exist - causing
|
||||
# them not to be rendered in the template - also it is fairly
|
||||
# safe to assume that no existing keys have been dropped because permission
|
||||
# requirements to view them were not met.
|
||||
@@ -2049,7 +2049,7 @@ class LoginView(two_factor.views.LoginView):
|
||||
def done(self, form_list, **kwargs):
|
||||
|
||||
"""
|
||||
User authenticated succesfully, set language options
|
||||
User authenticated successfully, set language options
|
||||
"""
|
||||
|
||||
response = super().done(form_list, **kwargs)
|
||||
|
Reference in New Issue
Block a user