fix subscription and user edit page

1 files changed, 1 insertions, 5 deletions

diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index c0d42732b..7b4e8c099 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -5,11 +5,6 @@ class Subscription
  
   attr_accessor :organisation_name, :user_name, :email, :password, :password_confirmation
  
-  validates_presence_of :organisation_name
-  validates_presence_of :user_name
-  validates_presence_of :email
-  validates_presence_of :password
-  validates_presence_of :password_confirmation
 
   def initialize(attributes = {})  
     attributes.each do |name, value|  
@@ -36,6 +31,7 @@ class Subscription
     unless user.valid?
       self.errors.add( :user_name, user.errors[:name]) if user.errors[:name]
       self.errors.add( :password, user.errors[:password]) if user.errors[:password]
+      self.errors.add( :password_confirmation, user.errors[:password_confirmation]) if user.errors[:password_confirmation]
       self.errors.add( :email, user.errors[:email]) if user.errors[:email]
     end
     self.errors.empty?