Matthias/conduit
1
0
Fork 0
Code Issues 179 Pull requests 44 Projects Releases 5 Packages Wiki Activity

Fix table headers and pagination

Browse source
This commit is contained in:
tezlm 2023-10-04 23:24:33 -07:00
parent 84f259d45e
commit 8d7982900a
No known key found for this signature in database
GPG key ID: 649733FCD94AFBBA
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/service/admin/mod.rs
View file

@ -778,8 +778,12 @@ impl Service {
rooms.sort_by_key(|r| r.1); rooms.sort_by_key(|r| r.1);
rooms.reverse(); rooms.reverse();
let slice_start = page.saturating_sub(1) * PAGE_SIZE; let rooms: Vec<_> = rooms.into_iter()
let Some(rooms) = rooms.get(slice_start..slice_start + PAGE_SIZE) else { .skip(page.saturating_sub(1) * PAGE_SIZE)
.take(PAGE_SIZE)
.collect();
if rooms.is_empty() {
return Ok(RoomMessageEventContent::text_plain("No more rooms.")); return Ok(RoomMessageEventContent::text_plain("No more rooms."));
}; };
@ -792,7 +796,7 @@ impl Service {
.join("\n") .join("\n")
); );
let output_html = format!( let output_html = format!(
"<table><caption>Room list - page {page}</caption>\n<tr><th>id</th>\t<th>name</th>\t<th>members</th></tr>\n{}</table>", "<table><caption>Room list - page {page}</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
rooms rooms
.iter() .iter()
.map(|(id, members, name)| format!( .map(|(id, members, name)| format!(
@ -917,8 +921,12 @@ impl Service {
rooms.sort_by_key(|r| r.1); rooms.sort_by_key(|r| r.1);
rooms.reverse(); rooms.reverse();
let slice_start = page.saturating_sub(1) * PAGE_SIZE; let rooms: Vec<_> = rooms.into_iter()
let Some(rooms) = rooms.get(slice_start..slice_start + PAGE_SIZE) else { .skip(page.saturating_sub(1) * PAGE_SIZE)
.take(PAGE_SIZE)
.collect();
if rooms.is_empty() {
return Ok(RoomMessageEventContent::text_plain("No more rooms.")); return Ok(RoomMessageEventContent::text_plain("No more rooms."));
}; };
@ -931,7 +939,7 @@ impl Service {
.join("\n") .join("\n")
); );
let output_html = format!( let output_html = format!(
"<table><caption>Room directory - page {page}</caption>\n<tr><th>id</th>\t<th>name</th>\t<th>members</th></tr>\n{}</table>", "<table><caption>Room directory - page {page}</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
rooms rooms
.iter() .iter()
.map(|(id, members, name)| format!( .map(|(id, members, name)| format!(