diff --git a/client-gui2 b/client-gui2 index 4e73919b..fb0322b7 160000 --- a/client-gui2 +++ b/client-gui2 @@ -1 +1 @@ -Subproject commit 4e73919b20c716496ff98ccc5bb1357bb65fa32f +Subproject commit fb0322b75f12f94e8ecbbcf65e0b2dc4192ecd56 diff --git a/common/proto/table_definition.proto b/common/proto/table_definition.proto index a94dc887..2eba3457 100644 --- a/common/proto/table_definition.proto +++ b/common/proto/table_definition.proto @@ -110,20 +110,22 @@ service TableDefinition { message ModuleScope { oneof target { - komp_ac.common.Empty global = 1; + komp_ac.common.Empty defaults = 1; string profile_name = 2; } } +// A missing profile returns the defaults that would be copied on ordinary creation. message GetModuleConfigurationRequest { ModuleScope scope = 1; } +// Profile updates require an existing profile. Defaults affect future profiles only. message SetModuleConfigurationRequest { ModuleScope scope = 1; repeated string enabled_modules = 2; // Initializes an existing profile's bookkeeping currency. Empty leaves it unchanged. - // Global scope and changes to an already configured currency are rejected. + // Defaults scope and changes to an already configured currency are rejected. string accounting_currency = 3; } @@ -131,7 +133,6 @@ message ModuleConfiguration { ModuleScope scope = 1; repeated string available_modules = 2; repeated string selected_modules = 3; - repeated string inherited_modules = 4; repeated string effective_modules = 5; string accounting_currency = 6; } diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index 9312d235..361635aa 100644 Binary files a/common/src/proto/descriptor.bin and b/common/src/proto/descriptor.bin differ diff --git a/common/src/proto/komp_ac.table_definition.rs b/common/src/proto/komp_ac.table_definition.rs index 56c4c31f..403ac8b2 100644 --- a/common/src/proto/komp_ac.table_definition.rs +++ b/common/src/proto/komp_ac.table_definition.rs @@ -11,17 +11,19 @@ pub mod module_scope { #[derive(Clone, PartialEq, Eq, Hash, ::prost::Oneof)] pub enum Target { #[prost(message, tag = "1")] - Global(super::super::common::Empty), + Defaults(super::super::common::Empty), #[prost(string, tag = "2")] ProfileName(::prost::alloc::string::String), } } +/// A missing profile returns the defaults that would be copied on ordinary creation. #[derive(serde::Serialize, serde::Deserialize)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct GetModuleConfigurationRequest { #[prost(message, optional, tag = "1")] pub scope: ::core::option::Option, } +/// Profile updates require an existing profile. Defaults affect future profiles only. #[derive(serde::Serialize, serde::Deserialize)] #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] pub struct SetModuleConfigurationRequest { @@ -30,7 +32,7 @@ pub struct SetModuleConfigurationRequest { #[prost(string, repeated, tag = "2")] pub enabled_modules: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, /// Initializes an existing profile's bookkeeping currency. Empty leaves it unchanged. - /// Global scope and changes to an already configured currency are rejected. + /// Defaults scope and changes to an already configured currency are rejected. #[prost(string, tag = "3")] pub accounting_currency: ::prost::alloc::string::String, } @@ -43,8 +45,6 @@ pub struct ModuleConfiguration { pub available_modules: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, #[prost(string, repeated, tag = "3")] pub selected_modules: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - #[prost(string, repeated, tag = "4")] - pub inherited_modules: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, #[prost(string, repeated, tag = "5")] pub effective_modules: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, #[prost(string, tag = "6")] diff --git a/server b/server index 5bad22db..ff9c6cbf 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 5bad22db532af93955bcc013b2486dd38a5d78a9 +Subproject commit ff9c6cbf7e37760dfa73777d06cf0b0bd2ea3737