From bed59f4aaa49f6039a810a16ef7d699f6c78aa2c Mon Sep 17 00:00:00 2001 From: Nadja Reitzenstein Date: Thu, 23 Feb 2023 14:21:49 +0100 Subject: [PATCH] Fix that part --- bffhd/capnp/machine.rs | 6 +++--- examples/bffh.dhall | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bffhd/capnp/machine.rs b/bffhd/capnp/machine.rs index 2f72290..18e8670 100644 --- a/bffhd/capnp/machine.rs +++ b/bffhd/capnp/machine.rs @@ -54,6 +54,9 @@ impl Machine { } { builder.set_use(capnp_rpc::new_client(self.clone())); + if self.resource.get_description().prodable { + builder.set_prodable(capnp_rpc::new_client(self.clone())); + } } if self.session.has_manage(&self.resource) { @@ -69,9 +72,6 @@ impl Machine { ArchivedStatus::InUse(owner) => { if owner == &user { builder.set_inuse(capnp_rpc::new_client(self.clone())); - if self.resource.get_description().prodable { - builder.set_prodable(capnp_rpc::new_client(self.clone())); - } } MachineState::InUse } diff --git a/examples/bffh.dhall b/examples/bffh.dhall index 45d70b8..2226369 100644 --- a/examples/bffh.dhall +++ b/examples/bffh.dhall @@ -135,7 +135,8 @@ manage = "lab.test.admin", name = "Another", read = "lab.test.read", - write = "lab.test.write" + write = "lab.test.write", + prodable = True }, Yetmore = { description = "Yet more test machines", @@ -232,6 +233,6 @@ init_connections = [] : List { machine : Text, initiator : Text }, --init_connections = [{ machine = "Testmachine", initiator = "Initiator" }] - spacename = "foospace", - instanceurl = "https://example.com" + spacename = Some "foospace", + instanceurl = Some "https://example.com" }