From 34659014dfa4ec34017642136038049279682ad8 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Thu, 11 Jun 2015 11:03:02 +0200
Subject: [PATCH] AutoCommit Don Jun 11 11:03:02 CEST 2015

---
 app/models/neuigkeit.rb                      |  2 ++
 app/views/documents/_search_results.html.erb | 10 ++++++----
 app/views/themes/blue2/home/intern.html.erb  | 14 ++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index a461e20..d7afddf 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -140,11 +140,13 @@ class Neuigkeit < ActiveRecord::Base
     if self.has_meeting? && !self.meeting.calentry.nil?
       self.update_column(:cache_order, (self.meeting.calentry.start.to_date - Date.today).to_i.abs * 1.3)
       self.update_column(:cache_relevant_date, self.meeting.calentry.start.to_date)
+      self.touch
     else 
       if self.is_event? 
         c = self.calentries.min_by{|c| c.days_to_today * 1.3 * ((c.is_past?)? 2:1)}
         self.update_column(:cache_order,  c.days_to_today * 1.3 * ((c.is_past?)? 2:1))
         self.update_column(:cache_relevant_date, (c.is_past?) ? c.ende.to_date : c.start.to_date)
+        self.touch
       else
         unless self.datum.nil?
           self.update_column(:cache_order, (((self.datum.to_date - Date.today).to_i)).abs)
diff --git a/app/views/documents/_search_results.html.erb b/app/views/documents/_search_results.html.erb
index 6a498de..8eb4055 100644
--- a/app/views/documents/_search_results.html.erb
+++ b/app/views/documents/_search_results.html.erb
@@ -1,12 +1,14 @@
+<% unless search_results.nil? %>
 <ul>
-	<% search_results.hits.each do |hit| %>
-		<li>
+	<% search_results.each_hit_with_result  do |hit,result| %>
+		<li> <%= result.name %>
 			<%  hit.highlights(:name).each do |hlgt| %>
-				<%=puts hlgt.format {|word|} "<b>#{word}</b>"  %>
+				<%= hlgt.format{|word|"<b>#{word}</b>" }  %>
 			<% end 	%>
 			<%  hit.highlights(:text).each do |hlgt| %>
-				<%=%>  puts hlgt.format {|word|} "<b>#{word}</b>" %> 
+				<%=  "text:" + raw(hlgt.format {|word| "*#{word}*" })%> 
 			<%  end %>
 		</li>	
 	<% end  %>
 </ul>
+	<% end  %>
diff --git a/app/views/themes/blue2/home/intern.html.erb b/app/views/themes/blue2/home/intern.html.erb
index a4d7cc9..fb6bbfd 100644
--- a/app/views/themes/blue2/home/intern.html.erb
+++ b/app/views/themes/blue2/home/intern.html.erb
@@ -1,22 +1,24 @@
-<h1> FET Intern NEU </h1>
+<h1> FET Intern NEU blue2</h1>
 <div class="container-fluid">
   <div class="row-fluid">
     <div class="span6">
 			<ul class="linklist">
 				<li>
-					<%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
-				<li>     <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+					<%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
+				</li>
+				<li>     
+					<%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
 				</li>
 			</ul>
-			<div>
-				<%= semantic_form_for :search,:remote=>true, :url=>search_documents_index_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %>
+			<div>Suche
+				<%= semantic_form_for :search,:remote=>true, :url=>search_documents_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %>
 					<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %>
 					<% f.actions do %>
 						<% f.action :submit, :as => :input %>
 					<% end %>
 				<% end %>
 				<div id="searchresults">
-					<%= render :partial=>"documents/search_results" %>
+					<%= render :partial=>"documents/search_results", :object=>@results %>
 				</div>
 			</div>
       <ul class="unstyled linkbox-list">