Skip to content

Commit 8b87c70

Browse files
authored
Merge pull request #771 from uw-it-aca/task/zoom-minus-shared-netids
clear row when legacy netid revoked
2 parents bcccb54 + 92270c5 commit 8b87c70

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

endorsement/static/endorsement/js/endorse.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ var Endorse = (function () {
111111
_loadContainer();
112112
_registerEvents();
113113
},
114-
114+
115115
endorse = function (modal_content_id, $rows) {
116116
var $modal = $('#endorse_modal'),
117117
template = Handlebars.compile($('#' + modal_content_id).html()),
@@ -230,6 +230,11 @@ var Endorse = (function () {
230230
return true;
231231
}
232232

233+
if (endorsement.endorsed === false && endorsement.is_legacy === true) {
234+
$row.remove();
235+
return true;
236+
}
237+
233238
is_first = $row.hasClass('endorsement_row_first');
234239
is_even = $row.hasClass('endorsee_row_even');
235240

endorsement/views/api/endorse.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,19 @@ def _endorse(self, to_endorse, service, endorser, endorser_json,
136136
try:
137137
e = service.clear_endorsement(
138138
endorser, endorsee)
139-
endorsements[service.service_name] = e.json_data()
139+
140+
if (not endorsee.is_person
141+
and not service.supports_shared_netids):
142+
# legacy shared netid revoked
143+
endorsements[service.service_name] = {
144+
'endorser': endorser_json,
145+
'endorsee': endorsee.json_data(),
146+
'endorsed': False,
147+
'is_legacy': True
148+
}
149+
else:
150+
endorsements[service.service_name] = e.json_data()
151+
140152
except NoEndorsementException as ex:
141153
endorsements[service.service_name] = {
142154
'endorser': endorser_json,

0 commit comments

Comments
 (0)