From 3b131fe6eb6e80c9eb66574eb7fca5cb2113cf9f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 26 Jul 2016 14:36:28 +0800 Subject: [PATCH] small msg changes --- app/models/email_entry.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/email_entry.rb b/app/models/email_entry.rb index c10bc5b..9ee8b30 100644 --- a/app/models/email_entry.rb +++ b/app/models/email_entry.rb @@ -2,7 +2,7 @@ class EmailEntry include Mongoid::Document include Mongoid::Timestamps include OrbitCategory::Categorizable - + field :mail_subject #not optional field :mail_content #not optional field :create_user_id @@ -31,11 +31,11 @@ class EmailEntry status = "" t = self.email_sentdate.nil? ? self.created_at : self.email_sentdate if self.approved && t < Time.now - status = "Sent" + status = "Delivered" elsif !self.approved status = "Waiting for approval" elsif self.approved && t > Time.now - status = "Mail ready to be send" + status = "Scheduled for delivery" elsif self.approved && t == Time.now status = "Sending" end