File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff 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 {
Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments