Skip to content

Commit 20e2f98

Browse files
fanglinfangfanglinfang
authored
Merge pull request #3013 from uw-it-aca/qa
Qa
2 parents 94ab2d8 + ca82f6b commit 20e2f98

24 files changed

+211
-217
lines changed

‎myuw/data/category_links_import.csv

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PageAcademics,Online Learning,all,,,,,,,https://www.tacoma.uw.edu/uwt/digital-le
77
PageAcademics,Online Learning,all,,,,,,,https://www.tacoma.uw.edu/teaching-learning-center/teaching-learning-center,Teaching and Learning Center,no,,,,,,,,,,,,,
88
PageAcademics,Online Learning,all,,,,,,,https://www.tacoma.uw.edu/uwt/it/equipment-checkout,Equipment Checkout,no,,,,,,,,,,,,,
99
PageAcademics,Registration,all,https://registrar.washington.edu/enrollment-and-degree-verification/,Self-Service Enrollment Verification,,,,,,,no,,,,,,,,,,,,,
10-
PageAcademics,Registration,all,,,https://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,https://www.uwb.edu/registration/time,UW Bothell Time Schedule,https://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no,,,,,,,,,,,,,
10+
PageAcademics,Registration,all,,,https://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,https://www.uwb.edu/registrar/time,UW Bothell Time Schedule,https://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no,,,,,,,,,,,,,
1111
PageAcademics,Registration,pce,https://www.washington.edu/students/timeschd/95index.html,Professional & Continuing Education Time Schedule,,,,,,,no,,,,,,,,,,,,,
1212
PageAcademics,Registration,all,,,http://www.washington.edu/students/crscat/,Course Catalog,https://www.washington.edu/students/crscatb/,Course Catalog,https://www.washington.edu/students/crscatt/,Course Catalog,no,,,,,,,,,,,,,
1313
PageAcademics,Registration,all,https://myplan.uw.edu/audit/#/degree,Degree Audit (DARS),,,,,,,yes,,,,,,,,,,,,,
@@ -18,11 +18,11 @@ PageAcademics,Registration,all,https://notify.uw.edu/,Notify.UW,,,,,,,yes,,,,,,,
1818
PageAcademics,Registration,all,http://dawgpath.uw.edu,DawgPath,,,,,,,yes,,,,,,,,,,,,,
1919
PageAcademics,Tutoring & Advising,ugrad,,,http://depts.washington.edu/aspuw/clue/home/,Center for Learning and Undergraduate Enrichment (CLUE),,,https://www.tacoma.uw.edu/teaching-learning-center/teaching-learning-center,Teaching and Learning Center,no,,,,,,,,,,,,,
2020
PageAcademics,Tutoring & Advising,all,,,https://iss.washington.edu/,International Student Services (ISS),https://www.uwb.edu/international-student-services/,International Student Services (ISS),https://www.tacoma.uw.edu/oga/isss,International Student & Scholar Services,no,,,,,,,,,,,,,
21-
PageAcademics,Tutoring & Advising,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,http://www.uwb.edu/wacc,Writing and Communication Center (WaCC),,,no,,,,,,,,,,,,,
21+
PageAcademics,Tutoring & Advising,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,https://www.uwb.edu/academic-support-programs/wacc,Writing and Communication Center (WaCC),,,no,,,,,,,,,,,,,
2222
PageAcademics,Tutoring & Advising,all,,,,,,,https://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources-0,Academic Writing Resources,no,,,,,,,,,,,,,
2323
PageAcademics,Tutoring & Advising,ugrad,,,http://www.washington.edu/uaa/advising/,Undergraduate Academic Advising (Pre-major),https://www.uwb.edu/premajor/academic-advising,Undergraduate Academic Advising (Pre-major),http://www.tacoma.uw.edu/advising,Undergraduate Academic Advising (Pre-major),no,,,,,,,,,,,,,
2424
PageAcademics,Tutoring & Advising,all,,,http://studyabroad.washington.edu/,Study Abroad,https://www.uwb.edu/connected-learning/global/abroad,Study Abroad,https://www.tacoma.uw.edu/oga/sa,Study Abroad,no,,,,,,,,,,,,,
25-
PageAcademics,Tutoring & Advising,all,,,http://careers.uw.edu/,Career & Internship Center,https://www.uwb.edu/careers,Career Services,https://www.tacoma.uw.edu/uwt/career,Career Development and Education,no,,,,,,,,,,,,,
25+
PageAcademics,Tutoring & Advising,all,,,http://careers.uw.edu/,Career & Internship Center,https://www.uwb.edu/career-services/,Career Services,https://www.tacoma.uw.edu/uwt/career,Career Development and Education,no,,,,,,,,,,,,,
2626
PageAcademics,Grades & Transcripts,all,https://www.washington.edu/uaa/advising/grades-credits/gpa-calculator/,GPA Calculator,,,,,,,no,,,,,,,,,,,,,
2727
PageAcademics,Grades & Transcripts,all,https://sdb.admin.uw.edu/sisStudents/uwnetid/grades.aspx,Grade Report,,,,,,,yes,,,,,,,,,,,,,
2828
PageAcademics,Grades & Transcripts,all,https://apps.registrar.washington.edu/credential_solutions_authentication/public/ce.php,Order Official Transcripts,,,,,,,yes,,,,,,,,,,,,,

‎myuw/data/links.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"id":11,
1414
"title":"Campus Map - Bothell",
15-
"url":"http://www.uwb.edu/getattachment/visitors/campus-map.pdf",
15+
"url":"https://www.uwb.edu/wp-content/uploads/2023/09/uw-bothell-campus-map.pdf",
1616
"on_for_employees":true,
1717
"on_for_undergrad":true,
1818
"on_for_gradstudent":true,
@@ -172,7 +172,7 @@
172172
{
173173
"id":101,
174174
"title":"Time Schedule - Bothell",
175-
"url":"http://www.uwb.edu/registration/time",
175+
"url":"https://www.uwb.edu/registrar/time",
176176
"on_for_employees":false,
177177
"on_for_undergrad":true,
178178
"on_for_gradstudent":true,

‎myuw/data/quicklinks.csv

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://sdb.admin.uw.edu/sisStudents/uwnetid/grades.aspx,Grade Report,,student,
99
https://wd5.myworkday.com/uw/login.htmld,Workday,,employee,
1010
https://sdb.admin.uw.edu/students/uwnetid/register.asp,Register using SLN codes,,student,
1111
https://sdb.admin.uw.edu/sisStudents/uwnetid/finaidstatus.aspx,Financial Aid Status,,student,
12-
https://www.uwb.edu/registration/time,Time Schedule - Bothell,bothell,student,
12+
https://www.uwb.edu/registrar/time,Time Schedule - Bothell,bothell,student,
1313
http://www.washington.edu/students/timeschd/,Time Schedule - Seattle,seattle,student,
1414
http://www.washington.edu/students/timeschd/T/,Time Schedule - Tacoma,tacoma,student,
1515
http://www.washington.edu/students/timeschd/95index.html,Time Schedule - PCE,,student,yes
@@ -49,5 +49,5 @@ http://www.tacoma.uw.edu/news/news-information,UW Tacoma News,,past_stud,
4949
http://www.tacoma.uw.edu/news/news-information,UW Tacoma News,,past_stud,
5050
https://teaching.washington.edu/topics/,Teaching Strategies,,instructor,
5151
http://webster.uaa.washington.edu/asp/website/online-learning/,Online Learning Resources,seattle,student,
52-
https://www.uwb.edu/it/student-continuity,Student Help for Learning Online,bothell,student,
52+
https://www.uwb.edu/it/learning,Learn Anywhere,bothell,student,
5353
https://www.tacoma.uw.edu/digital-learning/student-online-support,Online Learning Support,tacoma,student,

‎myuw/data/resource_link_import.csv

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Academics,Advising & Tutoring,all,,,http://careers.uw.edu/,Career & Internship C
33
Academics,Advising & Tutoring,all,https://careers.uw.edu/graduate-students/,Career & Internship Center - Graduate Student Resources,,,,,,,no
44
Academics,Advising & Tutoring,all,,,https://webster.uaa.washington.edu/asp/website/,Center for Learning and Undergraduate Enrichment (CLUE),https://webster.uaa.washington.edu/asp/website/,Center for Learning and Undergraduate Enrichment (CLUE),http://www.tacoma.uw.edu/teaching-learning-center/teaching-learning-center,Teaching and Learning Center,no
55
Academics,Advising & Tutoring,all,,,http://iss.washington.edu/,International Student Services (ISS),https://www.uwb.edu/international-student-services/,International Student Services (ISS),https://www.tacoma.uw.edu/oga/isss,International Student Services (ISS),no
6-
Academics,Advising & Tutoring,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,http://www.uwb.edu/wacc,Writing and Communication Center (WaCC),https://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources,Writing Center,no
6+
Academics,Advising & Tutoring,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,https://www.uwb.edu/academic-support-programs/wacc,Writing and Communication Center (WaCC),https://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources,Writing Center,no
77
Academics,Advising & Tutoring,all,,,,,,,http://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources-0,Academic Writing Resources,no
88
Academics,Advising & Tutoring,all,,,http://www.washington.edu/uaa/advising/,Undergraduate Academic Advising (Pre-major),https://www.uwb.edu/premajor/academic-advising,Undergraduate Academic Advising (Pre-major),https://www.tacoma.uw.edu/advising,Undergraduate Academic Advising (Pre-major),no
99
Academics,Advising & Tutoring,all,,,http://studyabroad.washington.edu/,Study Abroad,https://www.uwb.edu/connected-learning/global/abroad,Study Abroad,https://www.tacoma.uw.edu/oga/sa,Study Abroad,no
@@ -22,7 +22,7 @@ Academics,Registration,all,https://notify.uw.edu/,Notify.UW,,,,,,,no
2222
Academics,Registration,all,http://dawgpath.uw.edu,DawgPath,,,,,,,no
2323
Academics,Registration,all,https://sdb.admin.uw.edu/students/uwnetid/register.asp,Registration,,,,,,,no
2424
Academics,Registration,all,,,https://sdb.admin.uw.edu/timeschd/uwnetid/findschd.asp,Schedule Finder,https://sdb.admin.uw.edu/timeschd/uwnetid/findschd.asp,Schedule Finder,,,no
25-
Academics,Registration,all,,,http://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,http://www.uwb.edu/registration/time,UW Bothell Time Schedule,http://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no
25+
Academics,Registration,all,,,http://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,https://www.uwb.edu/registrar/time,UW Bothell Time Schedule,http://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no
2626
Academics,Registration,all,http://www.washington.edu/students/timeschd/95index.html,Professional & Continuing Education (PCE) Time Schedule,,,,,,,no
2727
Academics,Registration,all,https://www.degreereg.uw.edu/user-guide,How to Register for PCE Courses,,,,,,,no
2828
Academics,Tools and Software,all,http://canvas.uw.edu/,Canvas LMS,,,,,,,no
@@ -66,11 +66,11 @@ Campus Life,Campus Safety,all,http://www.washington.edu/safecampus/,SafeCampus,,
6666
Campus Life,Campus Safety,all,,,https://www.ehs.washington.edu/,Environmental Health & Safety,https://www.uwb.edu/safety/ehs-emergency/environment-health-safety,Environmental Health & Safety,https://www.tacoma.uw.edu/fa/environmental-health-safety,Environmental Health & Safety,no
6767
Campus Life,Campus Safety,all,https://cspc.admin.uw.edu/mychem,MyChem,,,,,,,no
6868
Campus Life,Campus Safety,all,,,https://www.washington.edu/uwem/,UW Emergency Management,https://www.uwb.edu/emergency,UW Bothell Emergency Page,https://www.tacoma.uw.edu/fa/safety/emergency-preparedness,UW Tacoma Emergency Response,no
69-
Campus Life,Getting Around Campus,all,,,http://www.washington.edu/maps/,Campus Map,https://www.uwb.edu/wp-content/uploads/2023/04/uw-bothell-campus-map.pdf,Campus Map,http://www.tacoma.uw.edu/campus-map/campus-map,Campus Map,no
69+
Campus Life,Getting Around Campus,all,,,http://www.washington.edu/maps/,Campus Map,https://www.uwb.edu/wp-content/uploads/2023/09/uw-bothell-campus-map.pdf,Campus Map,http://www.tacoma.uw.edu/campus-map/campus-map,Campus Map,no
7070
Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/park-directions,Getting to Seattle Campus,http://www.uwb.edu/visitors/directions,Getting to UW Bothell Campus,https://www.tacoma.uw.edu/fa/facilities/transportation/parking-and-transportation-resources#permalink-19448,Getting to UW Tacoma Campus,no
7171
Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/student-u-pass,U-PASS for Students,https://www.uwb.edu/commuter-services/transportation/upass,U-PASS,https://www.tacoma.uw.edu/uwt/fa/facilities/transportation/u-pass,U-PASS,no
7272
Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/employee-u-pass,U-PASS for Employees,,,,,no
73-
Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/,Transportation Services,https://www.uwb.edu/administration-planning/facilities/transportation,Commuter Services,https://www.tacoma.uw.edu/fa/facilities/transportation,Transportation Services,no
73+
Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/,Transportation Services,https://www.uwb.edu/commuter-services/,Commuter Services,https://www.tacoma.uw.edu/fa/facilities/transportation,Transportation Services,no
7474
Campus Life,Getting Around Campus,all,,,http://uwshuttles.com/,UW Shuttles,,,,,no
7575
Campus Life,Health & Wellness,all,https://wellbeing.uw.edu/,Husky Health & Well-Being,,,,,,,no
7676
Campus Life,Health & Wellness,all,,,http://www.washington.edu/counseling/,Counseling Center,https://www.uwb.edu/student-affairs/counseling,Counseling Services,https://www.tacoma.uw.edu/uwt/caps,Counseling & Psychological Services,no

‎myuw/views/notice_admin.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
import logging
5-
import bleach
5+
import nh3
66
import traceback
77
import unicodedata
88
from django.shortcuts import render, redirect
@@ -17,13 +17,13 @@
1717
from myuw.views import set_admin_wrapper_template
1818

1919
logger = logging.getLogger(__name__)
20-
ALLOWED_TAGS = [
20+
ALLOWED_TAGS = {
2121
'b', 'br', 'em', 'p', 'span', 'a', 'img', 'i', 'li', 'ol', 'strong', 'ul'
22-
]
22+
}
2323
ALLOWED_ATTS = {
24-
'*': ['class'],
25-
'a': ['href', 'rel', 'title'],
26-
'img': ['alt']
24+
'*': {'class', 'style', 'title'},
25+
'a': {'href', 'rel'},
26+
'img': {'alt'}
2727
}
2828

2929

@@ -272,8 +272,9 @@ def _get_integer(str):
272272

273273
def _get_html(value):
274274
try:
275-
content = bleach.clean(
276-
value, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTS)
275+
content = nh3.clean(
276+
value, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTS,
277+
link_rel=None)
277278
return unicodedata.normalize("NFKD", content).strip()
278279
# MUWM-5092
279280
except TypeError as ex:

‎myuw_vue/components/accounts/upass.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -123,28 +123,28 @@ export default {
123123
},
124124
getPurchaseUrl() {
125125
return this.bothell
126-
? 'https://www.uwb.edu/facilities/commuter-services/transportation/upass#Purchase/Cancel%20%20U-Pass'
126+
? 'https://www.uwb.edu/commuter-services/transportation/upass'
127127
: 'https://www.pce.uw.edu/help/registration-costs/costs-and-fees';
128128
},
129129
getWhatIsUrl() {
130130
return this.tacoma
131131
? 'https://www.tacoma.uw.edu/fa/facilities/transportation/u-pass-benefits'
132132
: this.bothell
133-
? 'https://www.uwb.edu/facility/commuter-services/transportation/upass#What%20the%20U-PASS%20covers'
133+
? 'https://www.uwb.edu/commuter-services/transportation/upass'
134134
: 'https://transportation.uw.edu/getting-here/transit/u-pass';
135135
},
136136
getSummerPurchaseUrl() {
137137
return this.tacoma
138138
? 'https://www.tacoma.uw.edu/fa/facilities/transportation/universal-u-pass'
139139
: this.bothell
140-
? 'https://www.uwb.edu/facilities/commuter-services/transportation/upass#Purchase/Cancel%20%20U-Pass'
140+
? 'https://www.uwb.edu/commuter-services/transportation/upass'
141141
: 'https://transportation.uw.edu/getting-here/transit/u-pass#u-pass-students';
142142
},
143143
getEmployeePurchaseUrl(){
144144
return this.tacoma
145145
? 'https://www.tacoma.uw.edu/fa/facilities/transportation/employee-u-pass-order-form'
146146
: this.bothell
147-
? 'https://www.uwb.edu/facility/commuter-services/transportation/upass'
147+
? 'https://www.uwb.edu/commuter-services/transportation/upass'
148148
: 'https://transportation.uw.edu/getting-here/transit/u-pass';
149149
}
150150
},

‎myuw_vue/components/home/applicant/bothell.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<li>
4040
You will then register beginning with Registration Period II for your returning quarter.
4141
Check dates on the
42-
<a href="http://www.uwb.edu/calendars">Academic Calendar</a>.
42+
<a href="https://www.uwb.edu/academic-calendar/">Academic Calendar</a>.
4343
</li>
4444
</ul>
4545

@@ -53,7 +53,7 @@
5353
</a>
5454
</li>
5555
<li class="mb-1">
56-
<a v-out="'UW Bothell Student Resources'" href="http://www.uwb.edu/studentaffairs">
56+
<a v-out="'UW Bothell Student Resources'" href="https://www.uwb.edu/student-affairs/">
5757
Check out the student resources for student life, career services, and more
5858
</a>
5959
</li>

‎myuw_vue/components/home/former_student/transcripts.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
>Contact the UW Registrar</a>
3939
</li>
4040
<li class="mb-1">
41-
<a v-out="'UW Bothell Registrar'" href="https://www.uwb.edu/registration"
42-
>Contact th UW Bothell Registrar</a>
41+
<a v-out="'UW Bothell Registrar'" href="https://www.uwb.edu/registrar/"
42+
>Contact the UW Bothell Registrar</a>
4343
</li>
4444
<li>
4545
<a v-out="'UW Tacoma Registrar'"

‎myuw_vue/components/home/graduation/application-submitted.vue

+8-7
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,15 @@
9191
</li>
9292
<li v-if="bothell">
9393
Get all the details on
94-
<a href="https://www.uwb.edu/registration/graduation">
94+
<a href="https://www.uwb.edu/registrar/graduation">
9595
UW Bothell’s Graduation, Diplomas, and Commencement page</a
9696
>.
9797
</li>
9898
<li v-if="bothell && intlStudent">
99-
International students, may find
100-
<a href="https://www.uwb.edu/cie/alumni"> additional graduation guidance </a> at the
101-
Center for International Education.
99+
International students, may find additional graduation guidance about
100+
<a href=
101+
"https://www.uwb.edu/international-student-services/optional-practical-training-opt">
102+
Optional Practical Training (OPT)</a>.
102103
</li>
103104
<li v-if="tacoma">
104105
Review the
@@ -216,7 +217,7 @@
216217
<ul class="list-style myuw-text-md">
217218
<li v-if="bothell">
218219
Find out how to
219-
<a href="https://www.uwb.edu/registration/enrollment-verify"
220+
<a href="https://www.uwb.edu/registrar/enrollment-verify#degree-certification"
220221
>provide degree certification</a
221222
>
222223
to other parties.
@@ -363,7 +364,7 @@
363364
- career consulting
364365
</li>
365366
<li v-if="bothell">
366-
<a href="https://www.uwb.edu/careers">Career and Internship Center</a>
367+
<a href="https://www.uwb.edu/career-services/">Career Services</a>
367368
- career consulting
368369
</li>
369370
<li v-if="tacoma">
@@ -388,7 +389,7 @@
388389
your future or anything else, connect with a counselor.
389390
</li>
390391
<li v-if="bothell">
391-
<a href="https://www.uwb.edu/studentaffairs/counseling">Counseling Center</a>
392+
<a href="https://www.uwb.edu/student-affairs/counseling">Counseling Center</a>
392393
- If you are anxious about your future or need someone compassionate to talk to about
393394
your future or anything else, connect with a counselor.
394395
</li>

‎myuw_vue/components/home/graduation/pre-application.vue

+6-5
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@
5656
</p>
5757
<p v-if="bothell" class="myuw-text-md">
5858
<strong>Get all the details on
59-
<a href="https://www.uwb.edu/registration/graduation">
59+
<a href="https://www.uwb.edu/registrar/graduation">
6060
UW Bothell’s Graduation, Diplomas, and Commencement page</a>.
6161
</strong>
6262
</p>
6363
<p v-if="bothell && intlStudent" class="myuw-text-md">
64-
International students, may find
65-
<a href="https://www.uwb.edu/cie/alumni">
66-
additional graduation guidance
67-
</a> at the Center for International Education.
64+
International students, may find additional graduation guidance about
65+
<a href=
66+
"https://www.uwb.edu/international-student-services/optional-practical-training-opt">
67+
Optional Practical Training (OPT)
68+
</a>.
6869
</p>
6970
<p v-if="seattle && intlStudent" class="myuw-text-md">
7071
International students, review the

0 commit comments

Comments
 (0)