bring over changes from develop repos
This commit is contained in:
parent
37660d826a
commit
b1202cc889
4 changed files with 36 additions and 5 deletions
|
@ -343,14 +343,45 @@ pub async fn admin_invitecode(
|
||||||
}
|
}
|
||||||
|
|
||||||
let active_codes = match list_invite_codes(nats.clone(), token.clone(), false).await {
|
let active_codes = match list_invite_codes(nats.clone(), token.clone(), false).await {
|
||||||
Ok(v) => v,
|
Ok(mut v) => {
|
||||||
|
for v in &mut v {
|
||||||
|
if let Some(used_by) = &v.used_by {
|
||||||
|
if used_by.len() > 32 {
|
||||||
|
v.used_by = Some(format!("{}...", &used_by[0..32]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if v.creator.len() > 32 {
|
||||||
|
v.creator = format!("{}...", &v.creator[0..32]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
v
|
||||||
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return e.into_response();
|
return e.into_response();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let used_codes = match list_invite_codes(nats.clone(), token.clone(), true).await {
|
let used_codes = match list_invite_codes(nats.clone(), token.clone(), true).await {
|
||||||
Ok(v) => v.into_iter().map(|mut v| if v.used_at.is_none() { v.used_at = Some(String::from("unset")); v } else { v }).collect(),
|
Ok(v) => v.into_iter().map(|mut v| {
|
||||||
|
if let Some(used_by) = &v.used_by {
|
||||||
|
if used_by.len() > 32 {
|
||||||
|
v.used_by = Some(format!("{}...", &used_by[0..32]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if v.creator.len() > 32 {
|
||||||
|
v.creator = format!("{}...", &v.creator[0..32]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if v.used_at.is_none() {
|
||||||
|
v.used_at = Some(String::from("unset"));
|
||||||
|
v
|
||||||
|
} else {
|
||||||
|
v
|
||||||
|
}
|
||||||
|
}).collect(),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return e.into_response();
|
return e.into_response();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{% extends "admin/shell.html" %}
|
{% extends "admin/shell.html" %}
|
||||||
|
|
||||||
{% block title %}Home{% endblock %}
|
{% block title %}Invite Codes{% endblock %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -16,7 +16,7 @@ use astro_float::{BigFloat, RoundingMode};
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
pub const PRECISION: usize = 1024;
|
pub const PRECISION: usize = 2048;
|
||||||
|
|
||||||
// length unit -> value in meters
|
// length unit -> value in meters
|
||||||
pub static LENGTH_STORE: Lazy<BTreeMap<LengthUnit, BigFloat>> = Lazy::new(|| {
|
pub static LENGTH_STORE: Lazy<BTreeMap<LengthUnit, BigFloat>> = Lazy::new(|| {
|
||||||
|
|
|
@ -15,7 +15,7 @@ use crate::length_units::{LengthUnit, LENGTH_NAMES, LENGTH_STORE, PRECISION};
|
||||||
use crate::unit_defs::{ConvertTo, MetricPrefix};
|
use crate::unit_defs::{ConvertTo, MetricPrefix};
|
||||||
use astro_float::{BigFloat, Consts, Radix, RoundingMode};
|
use astro_float::{BigFloat, Consts, Radix, RoundingMode};
|
||||||
|
|
||||||
pub const MAX_PRECISION: usize = 1024;
|
pub const MAX_PRECISION: usize = 2048;
|
||||||
|
|
||||||
pub mod length_units;
|
pub mod length_units;
|
||||||
pub mod unit_defs;
|
pub mod unit_defs;
|
||||||
|
|
Loading…
Add table
Reference in a new issue