From 491e3601417791ff4deae24bdd262e19c89bd0a1 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 18 Apr 2017 19:03:09 +0200
Subject: [PATCH] small fixes incl. solr

---
 app/models/gremium.rb                      | 2 +-
 app/models/neuigkeit.rb                    | 2 +-
 app/models/rubrik.rb                       | 2 +-
 app/models/thema.rb                        | 2 +-
 app/models/themengruppe.rb                 | 2 +-
 app/views/themes/blue2/home/index.html.erb | 2 +-
 config/locales/de.yml                      | 1 +
 config/locales/fetprofile_public.de.yml    | 1 +
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index 8ee1800..e7c4b1a 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -26,7 +26,7 @@ class Gremium < ActiveRecord::Base
 #  has_many :members, through: :memberships
   searchable do
     text :desc
-    text :name, :boost=>4.0
+    text :name
   end
 
   belongs_to :thema # Gehört zu einem Thema
diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index 0db49de..1529f2f 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -186,6 +186,6 @@ class Neuigkeit < ActiveRecord::Base
   searchable do
     text :text 
     text :datum
-    text :title, :boost=>3.0
+    text :title
   end
 end
diff --git a/app/models/rubrik.rb b/app/models/rubrik.rb
index 50f2135..636f508 100755
--- a/app/models/rubrik.rb
+++ b/app/models/rubrik.rb
@@ -42,7 +42,7 @@ end
 
  searchable do
     text :desc
-    text :name, :boost=>4.0
+    text :name
   end
 
 end
diff --git a/app/models/thema.rb b/app/models/thema.rb
index 1abc8b8..36cb2e5 100644
--- a/app/models/thema.rb
+++ b/app/models/thema.rb
@@ -47,7 +47,7 @@ class Thema < ActiveRecord::Base
   # make topic searchable 
   searchable do
     text :text
-    text :title, :boost=>4.0
+    text :title
   end
 
   resourcify  
diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb
index d37675a..8a27625 100644
--- a/app/models/themengruppe.rb
+++ b/app/models/themengruppe.rb
@@ -40,7 +40,7 @@ end
 
  searchable do
     text :text
-    text :title, :boost=>4.0
+    text :title
   end
 
 end
diff --git a/app/views/themes/blue2/home/index.html.erb b/app/views/themes/blue2/home/index.html.erb
index 0b9527b..ff72839 100644
--- a/app/views/themes/blue2/home/index.html.erb
+++ b/app/views/themes/blue2/home/index.html.erb
@@ -9,7 +9,7 @@
 
 <div class="content-wrap content-column" style="max-width:90em;">
  <h1><%= I18n.t('home.willkommen') %></h1>
-<%= raw(@starttopic.text) %>
+<%= raw(@starttopic.text) unless @starttopic.nil? %>
 
 
 <div class="container-fluid">
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cd61ce0..5b9c0a2 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -16,6 +16,7 @@ de:
     savecont: "Zwischenspeichern"
     intern: "Intern"
     manage: "Verwalten"
+    new: "Neu"
   home:
     sprache: "Deutsch"
     kontakt: "Kontakt"
diff --git a/config/locales/fetprofile_public.de.yml b/config/locales/fetprofile_public.de.yml
index 04d744c..e5d49d6 100644
--- a/config/locales/fetprofile_public.de.yml
+++ b/config/locales/fetprofile_public.de.yml
@@ -6,6 +6,7 @@ de:
     active_members: "Aktive Mitglieder"
     notactive_members: "Pension"
     new_profile: "Neues Profil anlegen"
+    new: "Neues Profil anlegen"
   gremium:
     new: "Neues Gremium"
     seit: "seit"