Fixing more DM 0.9 fun issues with include order

gustin · Jun 11, 2008 · c61c20c · c61c20c
1 parent 18ebc87
commit c61c20c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/models/activity.rb b/app/models/activity.rb
@@ -1,8 +1,11 @@
 class Activity
+  include DataMapper::Validate
   include DataMapper::Resource
 
   property :id, Integer, :key => true, :serial => true
-  property :message, String, :nullable => false, :length => 255
+  property :message, String, :length => 255
   property :created_at, DateTime
+
+  validates_present :message, :key => "uniq_msg"
 
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -5,9 +5,9 @@
   nil
 end
 class User
-  include DataMapper::Resource
   include DataMapper::Validate
   include AuthenticatedSystem::Model
+  include DataMapper::Resource
 
   attr_accessor :password, :password_confirmation
 

diff --git a/app/views/articles/_article.html.erb b/app/views/articles/_article.html.erb
@@ -6,7 +6,7 @@
   <div class="vcard">
     Posted by <span class="fn"><%= article.user.name %></span>
   </div>
-  <abbr class="published" title=""><%= article.published_at.strftime("on %b %d, %y") %></abbr>
+  <abbr class="published" title=""><%= article.published_at.strftime("on %b %d, %y") unless article.published_at.nil? %></abbr>
   <br class="clear" />
   <div class="entry-content">
     <%= render_article(article) %>