From e0312386e71e742cd4377ea1128eb16c2ddd5090 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 3 Apr 2017 15:25:22 +0200 Subject: [PATCH 1/7] no boost for studium --- app/models/studium.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/studium.rb b/app/models/studium.rb index 1fd5866..b3763e6 100755 --- a/app/models/studium.rb +++ b/app/models/studium.rb @@ -89,7 +89,7 @@ class Studium < ActiveRecord::Base text :zahl text :typ text :abkuerzung - text :name, :boost=>3.0 + text :name end end From 328adfe3a5fb7be276c8a00c668570e218d9b1e4 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 3 Apr 2017 15:25:40 +0200 Subject: [PATCH 2/7] calentries view fixed --- app/views/rubriken/index.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb index f4c6301..740721d 100755 --- a/app/views/rubriken/index.html.erb +++ b/app/views/rubriken/index.html.erb @@ -35,10 +35,11 @@
- +<% unless @calentries.nil? or @calentries.empty? %> <% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %> <%= render 'calendars/calentries', :object=>@calentries %> <% end %> + <% end %> <% if !current_user.nil? and current_user.has_role?(:fetuser) %> <%= link_to calendars_url(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid) , calendars_path(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid)%> <% end %> From cd439ecf02f6c7c9de7600ea0365cead62eebaba Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 3 Apr 2017 15:26:01 +0200 Subject: [PATCH 3/7] solr config update --- config/sunspot.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/sunspot.yml b/config/sunspot.yml index cef12a4..236e868 100644 --- a/config/sunspot.yml +++ b/config/sunspot.yml @@ -3,18 +3,18 @@ production: hostname: localhost port: 8080 log_level: WARNING - path: /solr-4.10.2/default #production #ollection1 #production + path: /solr/#/default #production #ollection1 #production # solr_home: solr # read_timeout: 2 # open_timeout: 0.5 development: solr: - hostname: localhost - port: 8982 + hostname: solr + port: 8983 log_level: INFO - path: /solr/development - + path: /solr/mycore + test: solr: hostname: localhost From ffaa57c91439af17ac8c73b5dbbbcddd339fbd29 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 3 Apr 2017 15:26:19 +0200 Subject: [PATCH 4/7] starttopic nil --- app/views/themes/blue1/home/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/themes/blue1/home/index.html.erb b/app/views/themes/blue1/home/index.html.erb index c62a6ea..b5826f3 100644 --- a/app/views/themes/blue1/home/index.html.erb +++ b/app/views/themes/blue1/home/index.html.erb @@ -9,7 +9,7 @@

<%= I18n.t('home.willkommen') %>

-<%= raw(@starttopic.text) %> +<%= raw(@starttopic.text) unless @starttopic.nil? %>
From 14598fbbd958c05b4f2f0fb9a116e8bfba381c79 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 3 Apr 2017 15:26:29 +0200 Subject: [PATCH 5/7] add a README --- README | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..9b1b424 --- /dev/null +++ b/README @@ -0,0 +1,25 @@ +SETUP: + +install ruby 2.1.10 + +install requirements +apt-get ... + + +mkdir /srv/fetsite +cd /srv/fetsite + +copy / fetch Gemfile + +make User fetsite + + +bundle install + +# Config Files kopieren: +cp /srv/fetsite/config/omniout_secrets.yml.example /srv/fetsite/config/omniout_secrets.yml +cp /srv/fetsite/config/omniout_secrets.yml.example /srv/fetsite/config/omniout_secrets.yml +touch crawler_config.yml + +# Datenbank erstellen +rake db:migrate \ No newline at end of file From dfef3721dc862eaab5a99dd9d68376f584adcad7 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 15 Apr 2017 15:32:26 +0200 Subject: [PATCH 6/7] test1 --- test1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test1 diff --git a/test1 b/test1 new file mode 100644 index 0000000..e69de29 From 491e3601417791ff4deae24bdd262e19c89bd0a1 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 18 Apr 2017 19:03:09 +0200 Subject: [PATCH 7/7] 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 @@

<%= I18n.t('home.willkommen') %>

-<%= raw(@starttopic.text) %> +<%= raw(@starttopic.text) unless @starttopic.nil? %>
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"