andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

fix mail & author

Browse Source
This commit is contained in:
Andreas Stephanides
2013-12-10 22:36:50 +01:00
parent 4e1df9ff08
commit 085695c632
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/neuigkeiten_controller.rb
View File

@@ -30,6 +30,7 @@ class NeuigkeitenController < ApplicationController
def new def new
@neuigkeit = Neuigkeit.new @neuigkeit = Neuigkeit.new
@rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil? @rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil?
@neuigkeit.author=current_user
@neuigkeit.rubrik=@rubrik unless @rubrik.nil? @neuigkeit.rubrik=@rubrik unless @rubrik.nil?
@calentries= [Calentry.new] @calentries= [Calentry.new]
@@ -78,6 +79,8 @@ class NeuigkeitenController < ApplicationController
def create def create
@neuigkeit = Neuigkeit.new(params[:neuigkeit]) @neuigkeit = Neuigkeit.new(params[:neuigkeit])
@neuigkeit.author=current_user
respond_to do |format| respond_to do |format|
if @neuigkeit.save if @neuigkeit.save
format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully created.' } format.html { redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit was successfully created.' }

2
app/models/user.rb
View File

@@ -57,7 +57,7 @@ logger.debug auth.to_s
user= User.create(name:auth.extra.raw_info.uid.first, user= User.create(name:auth.extra.raw_info.uid.first,
provider:auth.provider, provider:auth.provider,
uid:auth.extra.raw_info.uid.first, 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]) password:Devise.friendly_token[0,20])
user.add_role("fetuser") user.add_role("fetuser")
logger.debug(auth.extra.raw_info.to_s) logger.debug(auth.extra.raw_info.to_s)