Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn

app/models/card.rb

@@ -2,7 +2,8 @@ class Card < ActiveRecord::Base
   require 'open-uri'
 
   attr_accessible :id, :user_id, :name, :card_number, :card_permissions
-  validates_uniqueness_of :id,:card_number
+  validates_presence_of :user_id, :card_number, :card_permissions
+  validates_uniqueness_of :id, :card_number
   belongs_to :user
 
   def upload_to_door

app/models/user_certification.rb

@@ -1,12 +1,17 @@
 class UserCertification < ActiveRecord::Base
   attr_accessible :certification_id, :user_id
 
+  validates_presence_of :certification_id, :user_id
   validates_uniqueness_of :certification_id, :scope => :user_id, :message => 'already exists for this user.'  # Makes sure users don't get certified twice
 
   belongs_to :user
   belongs_to :certification
 
   def user_name
-    self.user.name unless self.user.blank?
+    if self.user.blank?
+      ""
+    else
+      self.user.name 
+    end
   end
 end