Small changes for v2024.12.0

Signed-off-by: BlackDex <black.dex@gmail.com>
BlackDex 2 weeks ago
parent f958731865
commit b0920a621c
No known key found for this signature in database
GPG Key ID: 58C80A2AA6C765E1

@ -78,6 +78,7 @@ pub fn routes() -> Vec<Route> {
restore_organization_user, restore_organization_user,
bulk_restore_organization_user, bulk_restore_organization_user,
get_groups, get_groups,
get_groups_details,
post_groups, post_groups,
get_group, get_group,
put_group, put_group,
@ -99,6 +100,7 @@ pub fn routes() -> Vec<Route> {
get_org_export, get_org_export,
api_key, api_key,
rotate_api_key, rotate_api_key,
get_billing_metadata,
] ]
} }
@ -1981,6 +1983,12 @@ fn get_plans_tax_rates(_headers: Headers) -> Json<Value> {
Json(_empty_data_json()) Json(_empty_data_json())
} }
#[get("/organizations/<_org_id>/billing/metadata")]
fn get_billing_metadata(_org_id: &str, _headers: Headers) -> Json<Value> {
// Prevent a 404 error, which also causes Javascript errors.
Json(_empty_data_json())
}
fn _empty_data_json() -> Value { fn _empty_data_json() -> Value {
json!({ json!({
"object": "list", "object": "list",
@ -2379,6 +2387,11 @@ async fn get_groups(org_id: &str, _headers: ManagerHeadersLoose, mut conn: DbCon
}))) })))
} }
#[get("/organizations/<org_id>/groups/details", rank = 1)]
async fn get_groups_details(org_id: &str, headers: ManagerHeadersLoose, conn: DbConn) -> JsonResult {
get_groups(org_id, headers, conn).await
}
#[derive(Deserialize)] #[derive(Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
struct GroupRequest { struct GroupRequest {
@ -2628,7 +2641,7 @@ async fn bulk_delete_groups(
Ok(()) Ok(())
} }
#[get("/organizations/<org_id>/groups/<group_id>")] #[get("/organizations/<org_id>/groups/<group_id>", rank = 2)]
async fn get_group(org_id: &str, group_id: &str, _headers: AdminHeaders, mut conn: DbConn) -> JsonResult { async fn get_group(org_id: &str, group_id: &str, _headers: AdminHeaders, mut conn: DbConn) -> JsonResult {
if !CONFIG.org_groups_enabled() { if !CONFIG.org_groups_enabled() {
err!("Group support is disabled"); err!("Group support is disabled");

@ -54,7 +54,12 @@ app-organization-plans > form > bit-section:nth-child(2) {
/* Hide Collection Management Form */ /* Hide Collection Management Form */
app-org-account form.ng-untouched:nth-child(6) { app-org-account form.ng-untouched:nth-child(6) {
display:none !important @extend %vw-hide;
}
/* Hide 'Member Access' Report Card from Org Reports */
app-org-reports-home > app-report-list > div.tw-inline-grid > div:nth-child(6) {
@extend %vw-hide;
} }
/* Hide Device Verification form at the Two Step Login screen */ /* Hide Device Verification form at the Two Step Login screen */

Loading…
Cancel
Save