From 085695c632b2c65b8981d3aaa8762b8730b4a9d8 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 10 Dec 2013 22:36:50 +0100 Subject: [PATCH] fix mail & author --- app/controllers/neuigkeiten_controller.rb | 3 +++ app/models/user.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index 9a83193..fbea85d 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -30,6 +30,7 @@ class NeuigkeitenController < ApplicationController def new @neuigkeit = Neuigkeit.new @rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil? + @neuigkeit.author=current_user @neuigkeit.rubrik=@rubrik unless @rubrik.nil? @calentries= [Calentry.new] @@ -78,6 +79,8 @@ class NeuigkeitenController < ApplicationController def create @neuigkeit = Neuigkeit.new(params[:neuigkeit]) + @neuigkeit.author=current_user + respond_to do |format| if @neuigkeit.save format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully created.' } diff --git a/app/models/user.rb b/app/models/user.rb index 29cc0b9..9215bc7 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -57,7 +57,7 @@ logger.debug auth.to_s user= User.create(name:auth.extra.raw_info.uid.first, provider:auth.provider, uid:auth.extra.raw_info.uid.first, - email:auth.extra.raw_info.uid.first.to_s+"@fet.at", + email:auth.extra.raw_info.mail.first.to_s, password:Devise.friendly_token[0,20]) user.add_role("fetuser") logger.debug(auth.extra.raw_info.to_s)