From b259c1080a57b2d6baf17e2e3b6739b4cab17af4 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Wed, 3 Dec 2014 02:41:54 +0100
Subject: [PATCH] merge

---
 app/models/ability.rb | 15 ++++++---------
 app/models/thema.rb   | 27 +++++++++++----------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 1514bda..2d6b594 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -114,15 +114,14 @@ class Ability
     unless user.has_role?("fetadmin")
       cannot :delete, Rubrik
       cannot :delete, Neuigkeit
-
     end
     # Calendar
-   if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
-     can :manage, Document
-     can :manage, Meeting
-     can :manage, Meetingtyp
-   end    
-
+    if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
+      can :manage, Document
+      can :manage, Meeting
+      can :manage, Meetingtyp
+    end    
+    
 
     # Rechteverwaltung Kalender 
     can [:show, :index], Calendar, :public => true 
@@ -130,8 +129,6 @@ class Ability
     can [:show], Calentry
 
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
-
-
       can [:show,:index], Calendar
       can  [:edit, :update,:new,:create,:verwalten], Calendar
       can  [:edit, :update,:new,:create,:verwalten,:delete], Calentry
diff --git a/app/models/thema.rb b/app/models/thema.rb
index 8dab0a6..c993349 100644
--- a/app/models/thema.rb
+++ b/app/models/thema.rb
@@ -25,22 +25,20 @@ include Rails.application.routes.url_helpers
   has_many :documents, :as=>:parent
   scope :public, where(:isdraft=>false).includes(:themengruppe).where("themengruppen.public"=>true)
   default_scope order("themen.priority").reverse_order
- # scope :search, ->(query) {where("themen.text like ? or themen.title like ?", "%#{query}%", "%#{query}%")}
- searchable do
+  # scope :search, ->(query) {where("themen.text like ? or themen.title like ?", "%#{query}%", "%#{query}%")}
+  searchable do
     text :text
     text :title, :boost=>4.0
   end
-  
-
-scope :outdated, -> {includes(:translations).where("thema_translations.updated_at<?",2.month.ago).where("thema_translations.locale"=>I18n.t.locale)
-}
+  scope :outdated, -> {includes(:translations).where("thema_translations.updated_at<?",2.month.ago).where("thema_translations.locale"=>I18n.t.locale)
+  }
   translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
   def is_outdated?
-   unless translation.try(:updated_at).nil?
-    translation.updated_at < 2.month.ago
-   else
-     false
-   end
+    unless translation.try(:updated_at).nil?
+      translation.updated_at < 2.month.ago
+    else
+      false
+    end
   end
   
   def text_first_words
@@ -50,16 +48,13 @@ scope :outdated, -> {includes(:translations).where("thema_translations.updated_a
       "...."
     else
       words[0..100].join(" ")+ " ..." unless  words.nil?
-      
     end
   end
-
+  
   def fix_links(host)
-   full_url= URI.parse(root_url(:host=>host))
+    full_url= URI.parse(root_url(:host=>host))
     self.text.gsub!(/src="[\.\/]*uploads\/attachment\/datei\/(\d+)\/thumb_big[^"]*"/){|s| full_url.path=Attachment.find($1.to_i).datei.thumb_big.url; 'src="'+full_url.to_s+'"'}
     self.text.gsub!(/src="[\.\/^"]*uploads\/attachment\/datei\/(\d+)\/[^"]*"/){|s| full_url.path=Attachment.find($1.to_i).datei.url; 'src="'+full_url.to_s+'"'}
-     
     self.text.gsub!(/href="[^"]*themen\/(\d+)[^"]*"/){|s| full_url.path=thema_path(Thema.find($1.to_i)); 'href="'+full_url.to_s+'"'}
-
   end
 end