create organisation

3 files changed, 13 insertions, 0 deletions

diff --git a/app/models/organisation.rb b/app/models/organisation.rb
new file mode 100644
index 000000000..28d592fc9
--- /dev/null
+++ b/app/models/organisation.rb
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+class Organisation < ActiveRecord::Base
+  has_many :users, :dependent => :destroy
+  has_many :referentials, :dependent => :destroy
+end
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 953038168..b87ba81e8 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -20,6 +20,8 @@ class Referential < ActiveRecord::Base
 
   has_many :imports, :dependent => :destroy
   has_many :exports, :dependent => :destroy
+  
+  belongs_to :organisation
 
   def slug_excluded_values
     if ! slug.nil?
diff --git a/app/models/user.rb b/app/models/user.rb
index b2f7c8ec9..53853530f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,4 +6,10 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
+
+  belongs_to :organisation
+
+  before_validation(:on => :create) do
+    self.password ||= Devise.friendly_token.first(6)
+  end
 end