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

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

Browse Source
This commit is contained in:
Andreas Stephanides
2015-02-11 01:16:49 +01:00
parent 44d35e196f 20240b75de
commit ddd786994c
7 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/neuigkeiten_controller.rb
View File

@@ -76,7 +76,7 @@ class NeuigkeitenController < ApplicationController
else
page=YAML.load_file("#{::Rails.root.to_s}/config/page.yml")
# page.feed!(:access_token=>page.access_token, :message=>@neuigkeit.text_first_words, :name=>@neuigkeit.title, :link=>rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit)+".html", :picture=>@neuigkeit.picture.url)
page.feed!(:access_token=>page.access_token, :message=>@neuigkeit.text_first_words, :name=>@neuigkeit.title, :link=>rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit)+".html", :picture=>picture_url)
page.feed!(:access_token=>page.access_token, :message=>@neuigkeit.text_first_words, :name=>@neuigkeit.title, :link=>rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit)+".html")# , :picture=>picture_url)
redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit auf Facebook gepostet'
end

4
app/controllers/rubriken_controller.rb
View File

@@ -10,7 +10,7 @@ class RubrikenController < ApplicationController
@neuigkeiten = Neuigkeit.public.published.page(params[:page]).per(3)
end
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
respond_to do |format|
format.html
format.js {render action: :show}
@@ -29,7 +29,7 @@ class RubrikenController < ApplicationController
@rubrik = Rubrik.find(params[:id])
@moderatoren=User.with_role(:newsmoderator,@rubrik)
@calentries= @rubrik.calendar.calentries
@calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil}
if can?(:showunpublished, Neuigkeit)
@neuigkeiten = @rubrik.neuigkeiten.page(params[:page]).per(3)
else

3
app/controllers/users_controller.rb
View File

@@ -18,7 +18,8 @@ class UsersController < ApplicationController
else
@fbu=FbGraph::User.new(current_user.uid.to_s).fetch(:access_token=>session["fbuser_access_token"])
File.open("config/page.yml",'w'){|f| f.write(@fbu.accounts(:access_token=>session["fbuser_access_token"]).select { |p| p.name == params["page"] }.first.to_yaml)}
logger.debug @fbu.to_s
logger.info @fbu.to_s
logger.info "FbGraph Access" + session["fbuser_access_token"]
redirect_to admin_home_index_path
end