correct subscription and add name in form

1 files changed, 8 insertions, 1 deletions

diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 8b2b025de..c0d42732b 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -5,6 +5,12 @@ 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|  
       send("#{name}=", value)  
@@ -16,7 +22,7 @@ class Subscription
   end  
 
   def user
-    @user ||= organisation.users.build :email => email, :password => password, :password_confirmation => password_confirmation
+    @user ||= organisation.users.build :name => user_name,:email => email, :password => password, :password_confirmation => password_confirmation
   end
 
   def organisation
@@ -28,6 +34,7 @@ class Subscription
       self.errors.add( :organisation_name, organisation.errors[:name]) if organisation.errors[:name]
     end
     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( :email, user.errors[:email]) if user.errors[:email]
     end