Updated modified date when saving and removed hardcoded attachment domain

This commit is contained in:
Daniel García 2018-02-15 01:07:57 +01:00
parent 31bf2bc2b1
commit 912901780e
6 changed files with 14 additions and 19 deletions

View File

@ -41,7 +41,7 @@ fn post_folders(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Jso
err!("Invalid name")
}
let folder = Folder::new(headers.user.uuid.clone(), name.unwrap().into());
let mut folder = Folder::new(headers.user.uuid.clone(), name.unwrap().into());
folder.save(&conn);

View File

@ -32,10 +32,7 @@ impl Attachment {
pub fn to_json(&self) -> JsonValue {
use util::get_display_size;
// TODO: Change all references to localhost (maybe put it in .env?)
let host = "http://localhost:8000";
let web_path = format!("{}/attachments/{}/{}", host, self.cipher_uuid, self.id);
let web_path = format!("/attachments/{}/{}", self.cipher_uuid, self.id);
let display_size = get_display_size(self.file_size);
json!({
@ -57,8 +54,6 @@ use db::schema::attachments;
/// Database methods
impl Attachment {
pub fn save(&self, conn: &DbConn) -> bool {
// TODO: Update modified date
match diesel::replace_into(attachments::table)
.values(self)
.execute(&**conn) {

View File

@ -82,11 +82,11 @@ impl Cipher {
})
}
pub fn save(&self, conn: &DbConn) -> bool {
// TODO: Update modified date
pub fn save(&mut self, conn: &DbConn) -> bool {
self.updated_at = Utc::now().naive_utc();
match diesel::replace_into(ciphers::table)
.values(self)
.values(&*self)
.execute(&**conn) {
Ok(1) => true, // One row inserted
_ => false,

View File

@ -82,11 +82,11 @@ use db::schema::devices;
/// Database methods
impl Device {
pub fn save(&self, conn: &DbConn) -> bool {
// TODO: Update modified date
pub fn save(&mut self, conn: &DbConn) -> bool {
self.updated_at = Utc::now().naive_utc();
match diesel::replace_into(devices::table)
.values(self)
.values(&*self)
.execute(&**conn) {
Ok(1) => true, // One row inserted
_ => false,

View File

@ -51,11 +51,11 @@ use db::schema::folders;
/// Database methods
impl Folder {
pub fn save(&self, conn: &DbConn) -> bool {
// TODO: Update modified date
pub fn save(&mut self, conn: &DbConn) -> bool {
self.updated_at = Utc::now().naive_utc();
match diesel::replace_into(folders::table)
.values(self)
.values(&*self)
.execute(&**conn) {
Ok(1) => true, // One row inserted
_ => false,

View File

@ -138,11 +138,11 @@ use db::schema::users;
/// Database methods
impl User {
pub fn save(&self, conn: &DbConn) -> bool {
// TODO: Update modified date
pub fn save(&mut self, conn: &DbConn) -> bool {
self.updated_at = Utc::now().naive_utc();
match diesel::replace_into(users::table) // Insert or update
.values(self)
.values(&*self)
.execute(&**conn) {
Ok(1) => true, // One row inserted
_ => false,