Skip to content

Commit d570b7b

Browse files
committed
Remove duplicate loading message
1 parent 345ce50 commit d570b7b

3 files changed

Lines changed: 0 additions & 25 deletions

File tree

astra_app/core/templates/core/membership_requests.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,10 @@ <h1 class="m-0">Membership Requests</h1>
105105
<th class="text-right" style="width: 15%;">Actions</th>
106106
</tr>
107107
</thead>
108-
<tbody>
109-
<tr>
110-
<td colspan="5" class="p-3 text-muted">Loading pending requests...</td>
111-
</tr>
112-
</tbody>
113108
</table>
114109
</div>
115110

116111
<div class="p-3 border-top">
117-
<div class="float-left text-muted small" id="membership-requests-pending-info">Loading pending requests...</div>
118112
<ul class="pagination pagination-sm m-0 float-right" id="membership-requests-pending-pager" aria-label="Pending pagination"></ul>
119113
</div>
120114
</div>
@@ -172,16 +166,10 @@ <h3 class="mt-4 mb-2">Waiting for requester response</h3>
172166
<th class="text-right" style="width: 15%;">Actions</th>
173167
</tr>
174168
</thead>
175-
<tbody>
176-
<tr>
177-
<td colspan="6" class="p-3 text-muted">Loading on-hold requests...</td>
178-
</tr>
179-
</tbody>
180169
</table>
181170
</div>
182171

183172
<div class="p-3 border-top">
184-
<div class="float-left text-muted small" id="membership-requests-on-hold-info">Loading on-hold requests...</div>
185173
<ul class="pagination pagination-sm m-0 float-right" id="membership-requests-on-hold-pager" aria-label="On-hold pagination"></ul>
186174
</div>
187175
</div>

astra_app/core/tests/test_membership_requests_datatables_api.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -742,8 +742,6 @@ def test_membership_requests_page_renders_datatables_shell(self) -> None:
742742
self.assertContains(response, 'data-membership-requests-notes-can-view="true"')
743743
self.assertContains(response, 'data-membership-requests-notes-can-write="true"')
744744
self.assertContains(response, 'data-membership-requests-notes-can-vote="true"')
745-
self.assertContains(response, 'Loading pending requests...')
746-
self.assertContains(response, 'Loading on-hold requests...')
747745
self.assertContains(response, 'id="membership-requests-pending-info"')
748746
self.assertContains(response, 'id="membership-requests-pending-pager"')
749747
self.assertContains(response, 'id="membership-requests-on-hold-info"')
@@ -1422,15 +1420,6 @@ class DocumentStub extends EventTarget {{
14221420
def test_script_executes_note_redraw_and_recomputes_bulk_and_modal_next(self) -> None:
14231421
self._run_node_scenario(
14241422
"""
1425-
assert(
1426-
document._pendingTbody.innerHTML.includes('Loading pending requests...'),
1427-
'Pending table should render a loading placeholder before the first draw completes.',
1428-
);
1429-
assert(
1430-
document._onHoldTbody.innerHTML.includes('Loading on-hold requests...'),
1431-
'On-hold table should render a loading placeholder before the first draw completes.',
1432-
);
1433-
14341423
const bulkNext = bulkForm.querySelector('input[name="next"]');
14351424
const modalNext = approveModalForm.querySelector('input[name="next"]');
14361425

astra_app/core/tests/test_membership_requests_on_hold_split.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ def test_requests_page_renders_pending_and_on_hold_shells(self) -> None:
106106
self.assertContains(resp, 'id="bulk-action-form-on-hold"')
107107
self.assertContains(resp, '>On hold since</th>')
108108
self.assertNotContains(resp, ">Waiting</th>")
109-
self.assertContains(resp, "Loading pending requests...")
110-
self.assertContains(resp, "Loading on-hold requests...")
111109
self.assertNotContains(resp, "Request #1")
112110

113111
def test_reject_modal_includes_reason_presets(self) -> None:

0 commit comments

Comments
 (0)