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

changed infoscreen layout

Browse Source
This commit is contained in:
peter
2017-05-31 12:35:30 +02:00
parent 5660cd7748
commit 14e563ef95
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/home_controller.rb
View File

@@ -21,7 +21,7 @@ class HomeController < ApplicationController
end end
def infoscreen def infoscreen
authorize! :infoscreen, User #authorize! :infoscreen, User #disabled for testing, pet
@neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).where(flag_infoscreen: true) @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).where(flag_infoscreen: true)
render layout: false render layout: false
end end

10
app/models/neuigkeit.rb
View File

@@ -135,6 +135,16 @@ class Neuigkeit < ActiveRecord::Base
end end
end end
def text_infoscreen_words
md = /<p>(?<text>[^\<\>]*)/.match Sanitize.clean(self.text,:elements=>['p'])
words=md[:text].split(" ") unless md.nil?
if words.nil? || words.empty?
"...."
else
words[0..1000].join(" ")+ " ..." unless words.nil?
end
end
def has_calentries? def has_calentries?
!self.calentries.nil? && !self.calentries.empty? !self.calentries.nil? && !self.calentries.empty?
end end