mareklach/Plume
1
0
Fork 0
forked from Plume/Plume
Code Issues Pull requests 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
Signed by untrusted user who does not match committer: igalic
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 (ld, _) = md_to_html(long_description.as_ref());
diesel::update(self)

6
src/routes/instance.rs
View file

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