aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

directly use SafeString in InstanceSettingsForm

Browse Source
This commit is contained in:
Igor Galić 2018-09-14 20:25:16 +02:00
parent d62c72dde0
commit 06718a5c8a
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plume-models/src/instance.rs
View File

@ -115,7 +115,7 @@ impl Instance {
)) ))
} }
pub fn update(&self, conn: &PgConnection, name: String, open_registrations: bool, short_description: String, long_description: String) -> Instance { pub fn update(&self, conn: &PgConnection, name: String, open_registrations: bool, short_description: SafeString, long_description: SafeString) -> Instance {
let (sd, _) = md_to_html(short_description.as_ref()); let (sd, _) = md_to_html(short_description.as_ref());
let (ld, _) = md_to_html(long_description.as_ref()); let (ld, _) = md_to_html(long_description.as_ref());
diesel::update(self) diesel::update(self)

6
src/routes/instance.rs
View File

@ -10,7 +10,9 @@ use plume_models::{
db_conn::DbConn, db_conn::DbConn,
posts::Post, posts::Post,
users::User, users::User,
safe_string::SafeString,
instance::* instance::*
}; };
use inbox::Inbox; use inbox::Inbox;
use routes::Page; use routes::Page;
@ -110,8 +112,8 @@ struct InstanceSettingsForm {
#[validate(length(min = "1"))] #[validate(length(min = "1"))]
name: String, name: String,
open_registrations: bool, open_registrations: bool,
short_description: String, short_description: SafeString,
long_description: String, long_description: SafeString,
#[validate(length(min = "1"))] #[validate(length(min = "1"))]
default_license: String default_license: String
} }