Skip to content

Commit c784468

Browse files
committed
Show also archive teams without website data entry
1 parent c439ba7 commit c784468

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/i18n.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,12 @@ impl TeamHelperParam {
129129

130130
fn english<'a>(&'a self, team: &'a serde_json::Value) -> &'a str {
131131
match self {
132-
TeamHelperParam::Name => team["website_data"]["name"].as_str().unwrap(),
133-
TeamHelperParam::Description => team["website_data"]["description"].as_str().unwrap(),
132+
TeamHelperParam::Name => team["website_data"]["name"]
133+
.as_str()
134+
.unwrap_or(team["name"].as_str().unwrap()),
135+
TeamHelperParam::Description => team["website_data"]["description"]
136+
.as_str()
137+
.unwrap_or_default(),
134138
TeamHelperParam::Role(role_id) => {
135139
for role in team["roles"].as_array().unwrap() {
136140
if role["id"] == *role_id {

src/teams.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,7 @@ impl RustTeams {
196196
}
197197

198198
pub fn archived_teams(&self) -> ArchivedTeams {
199-
let mut teams: Vec<Team> = self
200-
.archived_teams
201-
.iter()
202-
.filter(|t| t.website_data.is_some())
203-
.cloned()
204-
.collect();
199+
let mut teams: Vec<Team> = self.archived_teams.clone();
205200
teams.sort_by_key(|t| t.name.clone());
206201

207202
ArchivedTeams { teams }

0 commit comments

Comments
 (0)