From baad19e8382921e7adb8ced14a7e55f8b3a084fa Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sun, 29 Mar 2020 12:21:16 -0700 Subject: [PATCH] ui: Add function signature to accept and store policies --- ui/src/Page/Status.elm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ui/src/Page/Status.elm b/ui/src/Page/Status.elm index f9ce81f..00ead55 100644 --- a/ui/src/Page/Status.elm +++ b/ui/src/Page/Status.elm @@ -278,18 +278,19 @@ configPanel maybeConfig = , textEntry "SMTP Listener" config.smtpConfig.addr , textEntry "POP3 Listener" config.pop3Listener , textEntry "HTTP Listener" config.webListener - , textEntry "Accept Policy" (acceptPolicy config.smtpConfig) - , textEntry "Store Policy" (storePolicy config.smtpConfig) + , textEntry "Accept Policy" (acceptPolicy config) + , textEntry "Store Policy" (storePolicy config) , textEntry "Store Type" config.storageConfig.storeType , textEntry "Message Cap" (mailboxCap config) , textEntry "Retention Period" (retentionPeriod config) ] +acceptPolicy : ServerConfig -> String acceptPolicy config = - if config.defaultAccept then + if config.smtpConfig.defaultAccept then "All domains" - ++ (case config.rejectDomains of + ++ (case config.smtpConfig.rejectDomains of Nothing -> "" @@ -302,7 +303,7 @@ acceptPolicy config = else "No domains" - ++ (case config.acceptDomains of + ++ (case config.smtpConfig.acceptDomains of Nothing -> "" @@ -314,10 +315,11 @@ acceptPolicy config = ) +storePolicy : ServerConfig -> String storePolicy config = - if config.defaultStore then + if config.smtpConfig.defaultStore then "All domains" - ++ (case config.discardDomains of + ++ (case config.smtpConfig.discardDomains of Nothing -> "" @@ -330,7 +332,7 @@ storePolicy config = else "No domains" - ++ (case config.storeDomains of + ++ (case config.smtpConfig.storeDomains of Nothing -> ""