,
team: Option<&Team>,
main_team: &str,
@@ -238,7 +242,6 @@ impl Default for RustTeams {
}
}
-#[async_trait]
impl Cached for RustTeams {
fn get_timestamp(&self) -> Instant {
self.1
@@ -298,17 +301,26 @@ mod tests {
kind: TeamKind::Team,
subteam_of: None,
members: vec![
+ TeamMember {
+ name: "Jupiter Doe".into(),
+ github: "jupiterd".into(),
+ github_id: 123,
+ is_lead: false,
+ roles: vec!["convener".to_owned()],
+ },
TeamMember {
name: "John Doe".into(),
github: "johnd".into(),
+ github_id: 456,
is_lead: false,
- github_id: 1234,
+ roles: Vec::new(),
},
TeamMember {
name: "Jane Doe".into(),
github: "janed".into(),
+ github_id: 789,
is_lead: true,
- github_id: 1234,
+ roles: Vec::new(),
},
],
alumni: Vec::new(),
@@ -322,6 +334,7 @@ mod tests {
zulip_stream: None,
weight: 0,
}),
+ roles: Vec::new(),
github: None,
discord: vec![],
}
diff --git a/static/scripts/tools-install.js b/static/scripts/tools-install.js
index 02084f47f..3283aad5e 100644
--- a/static/scripts/tools-install.js
+++ b/static/scripts/tools-install.js
@@ -29,6 +29,7 @@ function detect_platform() {
if (navigator.platform == "Linux ppc64") {os = "unix";}
if (navigator.platform == "Linux mips") {os = "unix";}
if (navigator.platform == "Linux mips64") {os = "unix";}
+ if (navigator.platform == "Linux riscv64") {os = "unix";}
if (navigator.platform == "Mac") {os = "unix";}
if (navigator.platform == "Win32") {os = "win";}
if (navigator.platform == "FreeBSD x86_64") {os = "unix";}
diff --git a/templates/components/tools/editors.html.hbs b/templates/components/tools/editors.html.hbs
index fc39630a5..37bb84555 100644
--- a/templates/components/tools/editors.html.hbs
+++ b/templates/components/tools/editors.html.hbs
@@ -7,16 +7,12 @@
{{fluent "tools-editor-sublime"}}
-
@@ -28,7 +24,7 @@
class="button button-secondary">{{fluent "tools-editor-emacs"}}
diff --git a/templates/governance/group-team.html.hbs b/templates/governance/group-team.html.hbs
index 670037b2b..5fd32b72d 100644
--- a/templates/governance/group-team.html.hbs
+++ b/templates/governance/group-team.html.hbs
@@ -60,6 +60,10 @@
{{#if member.is_lead}}
{{fluent "governance-user-team-leader"}}
+ {{else}}
+ {{#if member.roles}}
+ {{team-text team role (lookup member.roles 0)}}
+ {{/if}}
{{/if}}