From b080583ba8068da2de5e5a13a10ebf96f9ae7195 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 1 May 2020 16:08:15 +0200
Subject: [PATCH] src/bin/proxmox-backup-manager.rs: improve user list output

---
 src/bin/proxmox-backup-manager.rs | 10 ++++++++--
 src/tools/format.rs               |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs
index f12d9632..6c0cf63f 100644
--- a/src/bin/proxmox-backup-manager.rs
+++ b/src/bin/proxmox-backup-manager.rs
@@ -133,8 +133,14 @@ fn list_users(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<Value, Er
 
     let options = default_table_format_options()
         .column(ColumnConfig::new("userid"))
-        .column(ColumnConfig::new("enable"))
-        .column(ColumnConfig::new("expire"))
+        .column(
+            ColumnConfig::new("enable")
+                .renderer(tools::format::render_bool_with_default_true)
+        )
+        .column(
+            ColumnConfig::new("expire")
+                .renderer(tools::format::render_epoch)
+        )
         .column(ColumnConfig::new("firstname"))
         .column(ColumnConfig::new("lastname"))
         .column(ColumnConfig::new("email"))
diff --git a/src/tools/format.rs b/src/tools/format.rs
index 23019908..ddec648e 100644
--- a/src/tools/format.rs
+++ b/src/tools/format.rs
@@ -41,3 +41,8 @@ pub fn render_task_status(value: &Value, record: &Value) -> Result<String, Error
         Ok(value.as_str().unwrap_or("unknown").to_string())
     }
 }
+
+pub fn render_bool_with_default_true(value: &Value, _record: &Value) -> Result<String, Error> {
+    let value = value.as_bool().unwrap_or(true);
+    Ok((if value { "1" } else { "0" }).to_string())
+}