Merge branch 'master' of https://github.com/andreassteph/fetsite

app/models/fetprofile.rb

@@ -15,12 +15,13 @@
 #
 
 class Fetprofile < ActiveRecord::Base
-  attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname
+  attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname,:memberships_attributes
   has_many :memberships
   has_many :gremien, :through=> :membership
   mount_uploader :picture, PictureUploader
   def name
   [vorname, nachname, "(",short,")"].join(" ")
   end
+  accepts_nested_attributes_for :memberships
   scope :active, -> { where(:active=>:true).order(:vorname) } 
 end

app/models/user.rb

@@ -30,10 +30,29 @@ class User < ActiveRecord::Base
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,:confirmable,
-         :recoverable, :rememberable, :trackable, :validatable
+         :recoverable, :rememberable, :trackable, :validatable,:omniauthable, :omniauth_providers => [:facebook]
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :provider, :uid, :name
   # attr_accessible :title, :body
-
+	def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
+		user = User.where(:provider => auth.provider, :uid => auth.uid).first
+		unless user
+			user = User.create(name:auth.extra.raw_info.name,
+                         provider:auth.provider,
+                         uid:auth.uid,
+                         email:auth.info.email,
+                         password:Devise.friendly_token[0,20]
+                         )
+		end
+		user
+	end
+	def self.new_with_session(params, session)
+    super.tap do |user|
+      if data = session["devise.facebook_data"] && session["devise.facebook_data"]["extra"]["raw_info"]
+        user.email = data["email"] if user.email.blank?
+      end
+    end
+  end
+  
 end