Implemented config form and fixed config priority

This commit is contained in:
Daniel García
2019-02-03 00:22:18 +01:00
parent ade293cf52
commit 3db815b969
6 changed files with 259 additions and 154 deletions

View File

@ -90,7 +90,7 @@ fn _validate_token(token: &str) -> bool {
struct AdminTemplateData {
users: Vec<Value>,
page_content: String,
config: String,
config: Value,
}
impl AdminTemplateData {
@ -98,7 +98,7 @@ impl AdminTemplateData {
Self {
users,
page_content: String::from("admin/page"),
config: CONFIG.get_config(),
config: CONFIG.prepare_json(),
}
}
@ -170,9 +170,6 @@ fn deauth_user(uuid: String, _token: AdminToken, conn: DbConn) -> EmptyResult {
#[post("/config", data = "<data>")]
fn post_config(data: Json<ConfigBuilder>, _token: AdminToken) -> EmptyResult {
let data: ConfigBuilder = data.into_inner();
info!("CONFIG: {:#?}", data);
CONFIG.update_config(data)
}