starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-18 15:34:09 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix up DB creation and migration

Browse Source
This commit is contained in:
Gregory Schier
2024-08-09 11:20:04 -07:00
parent d9a7dba2e2
commit 6eb2cbd582
10 changed files with 113 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src-tauri/src/render.rs
View File

@@ -1,7 +1,5 @@
use std::collections::HashMap;
use sqlx::types::JsonValue;
use serde_json::Value;
use crate::template_fns::timestamp;
use templates::parse_and_render;
use yaak_models::models::{
@@ -41,9 +39,9 @@ pub fn render_request(r: &HttpRequest, w: &Workspace, e: Option<&Environment>) -
} else {
v.to_string()
};
(render(k, vars), JsonValue::from(v))
(render(k, vars), Value::from(v))
})
.collect::<HashMap<String, JsonValue>>(),
.collect::<HashMap<String, Value>>(),
authentication: r
.authentication
.iter()
@@ -53,9 +51,9 @@ pub fn render_request(r: &HttpRequest, w: &Workspace, e: Option<&Environment>) -
} else {
v.to_string()
};
(render(k, vars), JsonValue::from(v))
(render(k, vars), Value::from(v))
})
.collect::<HashMap<String, JsonValue>>(),
.collect::<HashMap<String, Value>>(),
..r
}
}