summaryrefslogtreecommitdiff
path: root/help/app/models
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-02 15:29:28 -0700
committerjessib <jessib@riseup.net>2012-10-02 15:29:28 -0700
commit5bc3eae400754dda90a45d6953a02a069a1c0285 (patch)
tree9391b3bb5c3f0847746b52805c61ea346486301a /help/app/models
parent61d73ac517ccbcc7ca8892010ef89e861052807f (diff)
Some more tweaks to help ticket models. Still want to tweak current_user access from users engine.
Diffstat (limited to 'help/app/models')
-rw-r--r--help/app/models/ticket.rb6
-rw-r--r--help/app/models/ticket_comment.rb3
2 files changed, 5 insertions, 4 deletions
diff --git a/help/app/models/ticket.rb b/help/app/models/ticket.rb
index 8a282b5..0f38bf4 100644
--- a/help/app/models/ticket.rb
+++ b/help/app/models/ticket.rb
@@ -28,7 +28,7 @@ class Ticket < CouchRest::Model::Base
timestamps!
- before_validation :set_code, :on => :create
+ before_validation :set_created_by, :set_code, :on => :create
design do
view :by_title
@@ -37,7 +37,9 @@ class Ticket < CouchRest::Model::Base
validates :email, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, :if => :email #email address is optional
- #set created_by to be current_user
+ def set_created_by
+ self.created_by = User.current if User.current
+ end
def is_creator_validated?
!!created_by
diff --git a/help/app/models/ticket_comment.rb b/help/app/models/ticket_comment.rb
index 1e23136..6c2a792 100644
--- a/help/app/models/ticket_comment.rb
+++ b/help/app/models/ticket_comment.rb
@@ -26,8 +26,7 @@ class TicketComment < CouchRest::Model::Base #?? do we want this to be a base mo
end
def set_posted_by
- #should be something like this, but current_user is not set yet
- #self.posted_by = current_user if current_user
+ self.posted_by = User.current if User.current
end
end