From 6f92241840af2bab776f0a8891c100e714f64e57 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 6 Nov 2013 12:31:14 +0100 Subject: [PATCH 1/6] =?UTF-8?q?lva->typ=5Fname=20gibt=20typ=20+=20'=20'=20?= =?UTF-8?q?+=20name=20zur=C3=BCck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 8 ++++++++ app/models/lva.rb | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b7a77cb..bb82673 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,10 +100,15 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.21) + mini_portile (0.5.2) multi_json (1.5.1) multipart-post (1.2.0) mysql2 (0.3.13) net-ldap (0.2.2) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) + nokogiri (1.6.0-x86-mingw32) + mini_portile (~> 0.5.0) oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) @@ -175,6 +180,8 @@ GEM rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) rubyntlm (0.1.1) + sanitize (2.0.6) + nokogiri (>= 1.4.4) sass (3.2.5) sass-rails (3.2.6) railties (~> 3.2.0) @@ -239,6 +246,7 @@ DEPENDENCIES rmagick rolify rspec-rails + sanitize sass-rails (~> 3.2) seed_dump (~> 0.5.3) simple_calendar (~> 0.1.9) diff --git a/app/models/lva.rb b/app/models/lva.rb index 7f1339c..cdd273b 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -50,7 +50,11 @@ class Lva < ActiveRecord::Base validates :name, :presence=>true, :uniqueness=>{:scope=>:typ}# Name Eingetragen? validates :typ, :presence=>true, :inclusion=> ERLAUBTE_TYPEN validates_presence_of :stunden # Stunden Eingetragen? - validates_presence_of :modul # Zugehöriges Modul eingetragen? (zumindest eines) + validates_presence_of :modul # Zugehöriges Modul eingetragen? + # (zumindest eines) + def typ_name + return self.typ + ' ' + self.name + end def add_semesters # Diese Methode fügt die Instanz automatisch zu allen Studien als "Ohne Semesterempfehlung" (Semester 0) zu, bei denen die Instanz im Studium noch nicht vorkommt. for m in self.modul From d314a8126862e76d94c84a289a8883167b58a001 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Thu, 7 Nov 2013 09:52:45 +0100 Subject: [PATCH 2/6] introduced lva.full_name and rewrote displays --- app/models/lva.rb | 2 +- app/views/home/_beispiele.html.erb | 2 +- app/views/lvas/_lva_semester.html.erb | 2 +- app/views/studien/verwalten.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/lva.rb b/app/models/lva.rb index cdd273b..08eea7f 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -52,7 +52,7 @@ class Lva < ActiveRecord::Base validates_presence_of :stunden # Stunden Eingetragen? validates_presence_of :modul # Zugehöriges Modul eingetragen? # (zumindest eines) - def typ_name + def full_name return self.typ + ' ' + self.name end def add_semesters diff --git a/app/views/home/_beispiele.html.erb b/app/views/home/_beispiele.html.erb index 8355b53..3f66738 100644 --- a/app/views/home/_beispiele.html.erb +++ b/app/views/home/_beispiele.html.erb @@ -18,7 +18,7 @@ <%= link_to b, {:class=> :linkbox} do %>
- <%=b.name%> (<%=b.lva.name%>) + <%=b.name%> (<%=b.lva.full_name%>)
<%=b.updated_at.to_s%> diff --git a/app/views/lvas/_lva_semester.html.erb b/app/views/lvas/_lva_semester.html.erb index e1f8960..975ae0a 100755 --- a/app/views/lvas/_lva_semester.html.erb +++ b/app/views/lvas/_lva_semester.html.erb @@ -1,6 +1,6 @@
- <%=lva.lvanr.to_s %> <%= link_to lva.name, lva_path(lva)%> <%= lva.ects %> ECTS / <%= lva.stunden %> Std
+ <%=lva.lvanr.to_s %> <%= link_to lva.full_name, lva_path(lva)%> <%= lva.ects %> ECTS / <%= lva.stunden %> Std
    - <% themengruppe.themen.each do |t| %> + <% themengruppe.themen.order(:title).each do |t| %>
  • <%= render t %>
    • From f3288d5b694e970b4d6819d487d9a477e7226adc Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 11 Nov 2013 20:03:00 +0100 Subject: [PATCH 4/6] production environment compile online --- Gemfile.lock | 4 ++++ config/environments/production.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b7a77cb..b9db40f 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,6 +104,7 @@ GEM multipart-post (1.2.0) mysql2 (0.3.13) net-ldap (0.2.2) + nokogiri (1.5.6) oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) @@ -175,6 +176,8 @@ GEM rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) rubyntlm (0.1.1) + sanitize (2.0.3) + nokogiri (>= 1.4.4, < 1.6) sass (3.2.5) sass-rails (3.2.6) railties (~> 3.2.0) @@ -239,6 +242,7 @@ DEPENDENCIES rmagick rolify rspec-rails + sanitize sass-rails (~> 3.2) seed_dump (~> 0.5.3) simple_calendar (~> 0.1.9) diff --git a/config/environments/production.rb b/config/environments/production.rb index 6a0f219..1ea294d 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,7 +15,7 @@ Fetsite::Application.configure do config.assets.compress = true # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = false + config.assets.compile = true # Generate digests for assets URLs config.assets.digest = true From 0bb8460ca499016ee8128cbfabcedd1e30751fa3 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 11 Nov 2013 20:42:07 +0100 Subject: [PATCH 5/6] info ... --- Gemfile.lock | 3 --- app/views/studien/_studium.html.erb | 2 +- app/views/studien/show.html.erb | 6 ++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 878fda6..9073631 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,14 +105,11 @@ GEM multipart-post (1.2.0) mysql2 (0.3.13) net-ldap (0.2.2) -<<<<<<< HEAD nokogiri (1.5.6) -======= nokogiri (1.6.0) mini_portile (~> 0.5.0) nokogiri (1.6.0-x86-mingw32) mini_portile (~> 0.5.0) ->>>>>>> d314a8126862e76d94c84a289a8883167b58a001 oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb index cc45c82..f7b116d 100644 --- a/app/views/studien/_studium.html.erb +++ b/app/views/studien/_studium.html.erb @@ -12,7 +12,7 @@ <%= studium.typ%>

    <%=I18n.t("studien.desc")%>:
    - <%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%> + <%= !(studium.desc.to_s == "") ? studium.desc_first_words.html_safe : I18n.t("keine.beschreibung")%>

diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb index 9b78f5d..874a4c7 100644 --- a/app/views/studien/show.html.erb +++ b/app/views/studien/show.html.erb @@ -9,7 +9,13 @@
+ <% if params[:info]==true %> <%= raw(@studium.desc) %> + <% else %> + <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %> + <% end %> + + <% @studienphasen.each do |sp| %> <% sp[:modulgruppen].each do |row| %>
From 7b5c39616a609dd69414f830d68502709150ec48 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Tue, 12 Nov 2013 09:52:04 +0100 Subject: [PATCH 6/6] Fixed info --- app/views/studien/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb index 874a4c7..77e3daa 100644 --- a/app/views/studien/show.html.erb +++ b/app/views/studien/show.html.erb @@ -9,7 +9,7 @@
- <% if params[:info]==true %> + <% if params[:info].true? %> <%= raw(@studium.desc) %> <% else %> <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>