diff --git a/client b/client index e104825e..53ec9866 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit e104825edc850e8706ad85c2639c3cf6b432791e +Subproject commit 53ec9866affe26dd539357909ff6c90ff4b6dfd6 diff --git a/client-gui2 b/client-gui2 index f3ae8177..c14ecbe6 160000 --- a/client-gui2 +++ b/client-gui2 @@ -1 +1 @@ -Subproject commit f3ae817797640b4b89a135b1241d16379fd9c570 +Subproject commit c14ecbe687fa76be4da1065d6ca12c40989a46dd diff --git a/server b/server index 81a49d66..32374830 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 81a49d66d6c1e39655f06982e9c1ed87a69f0804 +Subproject commit 32374830ede06e5c013631ade51edd2125bb966c diff --git a/web/src/pages/add_table/logic.rs b/web/src/pages/add_table/logic.rs index 17292719..5a57a82c 100644 --- a/web/src/pages/add_table/logic.rs +++ b/web/src/pages/add_table/logic.rs @@ -247,7 +247,7 @@ mod tests { }); AddTablePageState { nav: crate::ui::Nav::default(), - shared_profile: "__global".to_string(), + shared_profile: "global".to_string(), profiles: vec!["billing".to_string()], rate_sources: vec!["ecb".to_string()], draft, diff --git a/web/src/pages/add_table/state.rs b/web/src/pages/add_table/state.rs index 5482bb1e..c9664dde 100644 --- a/web/src/pages/add_table/state.rs +++ b/web/src/pages/add_table/state.rs @@ -505,7 +505,7 @@ mod tests { fn the_column_list_shows_what_a_definition_row_expands_into() { let mut page = AddTablePageState { nav: crate::ui::Nav::default(), - shared_profile: "__global".to_string(), + shared_profile: "global".to_string(), profiles: Vec::new(), rate_sources: vec!["ecb".to_string()], draft: posted_form().to_draft(), @@ -592,7 +592,7 @@ mod tests { let page = AddTablePageState { nav: crate::ui::Nav::default(), - shared_profile: "__global".to_string(), + shared_profile: "global".to_string(), profiles: Vec::new(), rate_sources: vec!["ecb".to_string()], draft, diff --git a/web/src/pages/add_table/ui.rs b/web/src/pages/add_table/ui.rs index 69f6916c..c1fc91c9 100644 --- a/web/src/pages/add_table/ui.rs +++ b/web/src/pages/add_table/ui.rs @@ -109,7 +109,7 @@ mod tests { AddTablePageState { nav: Nav::default(), - shared_profile: "__global".to_string(), + shared_profile: "global".to_string(), profiles: vec!["billing".to_string()], rate_sources: vec!["ecb".to_string()], draft, diff --git a/web/src/pages/admin/admin/ui.rs b/web/src/pages/admin/admin/ui.rs index 10aa50f3..02b4c9b4 100644 --- a/web/src/pages/admin/admin/ui.rs +++ b/web/src/pages/admin/admin/ui.rs @@ -50,7 +50,7 @@ mod tests { /// What this deployment's server happens to call the shared profile. The /// page is handed the name rather than knowing it, so the tests spell it /// once here. - const SHARED_PROFILE: &str = "__global"; + const SHARED_PROFILE: &str = "global"; #[test] fn dashboard_links_every_admin_action() { @@ -131,7 +131,7 @@ mod tests { }; let html = render_workspace(&page); - assert!(html.contains(r#"name="profile" value="__global""#)); + assert!(html.contains(r#"name="profile" value="global""#)); assert!(html.contains("shared by every profile")); // Selecting it marks it, and its empty state names the global scope // rather than a profile that has no tables. @@ -209,7 +209,7 @@ mod tests { let html = render_workspace(&page); assert!( - html.contains("/admin/tables/delete?profile=__global&table=currencies"), + html.contains("/admin/tables/delete?profile=global&table=currencies"), "{html}" ); assert!(html.contains("/admin/tables/new?global=true")); diff --git a/web/src/pages/admin/table_definition/ui.rs b/web/src/pages/admin/table_definition/ui.rs index b970a29d..88d8eee4 100644 --- a/web/src/pages/admin/table_definition/ui.rs +++ b/web/src/pages/admin/table_definition/ui.rs @@ -258,7 +258,7 @@ mod tests { /// What this deployment's server happens to call the shared profile. The /// page is handed the name rather than knowing it. - const SHARED_PROFILE: &str = "__global"; + const SHARED_PROFILE: &str = "global"; fn page() -> TableDefinitionPageState { TableDefinitionPageState { diff --git a/web/src/pages/table_scope.rs b/web/src/pages/table_scope.rs index 74c46081..14f7fd7e 100644 --- a/web/src/pages/table_scope.rs +++ b/web/src/pages/table_scope.rs @@ -66,7 +66,7 @@ pub(crate) mod tests { /// What this deployment's server happens to call the shared profile; the /// tables carry it, and nothing here composes it. - const SHARED_PROFILE: &str = "__global"; + const SHARED_PROFILE: &str = "global"; pub(crate) fn table(name: &str, global: bool) -> Table { Table {