Upgrade passwords to the latest hashing scheme on login

[rails.git] / app / models / note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index 801e1f3cbee16a2a9c74014321cdd6490ae41ac7..10b74d8a669a46f431a03b476f94494c38064476 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -30,21 +30,11 @@ class Note < ActiveRecord::Base
     self.save
   end
 
-  # Return a flattened version of the comments for a note
-  def flatten_comment(separator_char, upto_timestamp = :nil)
-    resp = ""
-    comment_no = 1
-    self.comments.each do |comment|
-      next if upto_timestamp != :nil and comment.created_at > upto_timestamp
-      resp += (comment_no == 1 ? "" : separator_char)
-      resp += comment.body if comment.body
-      resp += " [ " 
-      resp += comment.author.display_name if comment.author
-      resp += " " + comment.created_at.to_s + " ]"
-      comment_no += 1
-    end
-
-    return resp
+  # Reopen a note
+  def reopen
+    self.status = "open"
+    self.closed_at = nil
+    self.save
   end
 
   # Check if a note is visible
@@ -52,6 +42,11 @@ class Note < ActiveRecord::Base
     status != "hidden"
   end
 
+  # Check if a note is closed
+  def closed?
+    not closed_at.nil?
+  end
+
   # Return the author object, derived from the first comment
   def author
     self.comments.first.author