From b990510212951350e6064fe36a7df85343d74e70 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Wed, 2 Apr 2014 12:35:42 +0200 Subject: [PATCH] fix neuigkeiten model --- app/controllers/moduls_controller.rb | 2 +- app/models/neuigkeit.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb index 9d8d8e6..8f08b89 100755 --- a/app/controllers/moduls_controller.rb +++ b/app/controllers/moduls_controller.rb @@ -66,7 +66,7 @@ class ModulsController < ApplicationController def edit_lvas @modul = Modul.find(params[:modul_id]) @lvas = @modul.lvas -@semester = @modul.modulgruppen.flatten.map(&:studium).map(&:semester).flatten.uniq + @semester = @modul.modulgruppen.flatten.map(&:studium).map(&:semester).flatten.uniq end def update_lvas diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index 0ee32b7..ab3bdd9 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -53,7 +53,7 @@ class Neuigkeit < ActiveRecord::Base self.title end def text_first_words - md = /

(?[\w\s,\.!\?]*)/.match strip_links(self.text) + md = /

(?[\w\s,\.!\?]*)/.match self.text words=md[:text].split(" ") unless md.nil? if words.nil? || words.empty? "...."