bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Kleinigkeiten

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-02 16:54:55 +02:00
parent 005c28a273
commit c4a27d17f2
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/lvas_controller.rb
View File

@@ -10,8 +10,9 @@ class LvasController < ApplicationController
def show def show
@lva = Lva.find_by_id(params[:id]) @lva = Lva.find_by_id(params[:id])
@toolbar_elements<<{:icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
@toolbar_elements<<{:icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)} @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)}
@toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
end end
# GET /lvas/new # GET /lvas/new

5
app/controllers/modulgruppen_controller.rb
View File

@@ -50,14 +50,17 @@ class ModulgruppenController < ApplicationController
def create def create
@modulgruppe = Modulgruppe.new(params[:modulgruppe]) @modulgruppe = Modulgruppe.new(params[:modulgruppe])
if !params[:studium_id].nil? if !params[:studium_id].nil?
@studium=Studium.find_by_id(params[:studium_id]) @studium=Studium.find_by_id(params[:studium_id])
else else
@studium=Studium.find_by_id(params[:modulgruppe][:studium_id]) @studium=Studium.find_by_id(params[:modulgruppe][:studium_id])
end end
@modulgruppe.studium_id = params[:studium_id]
respond_to do |format| respond_to do |format|
if @modulgruppe.save if @modulgruppe.save
format.html { redirect_to @modulgruppe, notice: 'Modulgruppe was successfully created.' } format.html { redirect_to @studium, notice: 'Modulgruppe was successfully created.' }
else else
format.html { render action: "new" } format.html { render action: "new" }

3
app/controllers/studien_controller.rb
View File

@@ -48,9 +48,10 @@ class StudienController < ApplicationController
def create def create
@studium = Studium.new(params[:studium]) @studium = Studium.new(params[:studium])
@studium.batch_add_semester
respond_to do |format| respond_to do |format|
if @studium.save if @studium.save
@studium.batch_add_semester
format.html { redirect_to url_for(@studium), notice: 'Studium was successfully created.' } format.html { redirect_to url_for(@studium), notice: 'Studium was successfully created.' }
else else
format.html { render action: "new" } format.html { render action: "new" }

2
app/models/studium.rb
View File

@@ -18,7 +18,7 @@ class Studium < ActiveRecord::Base
validates :typ, :inclusion => {:in => ["Bachelor","Master"] } validates :typ, :inclusion => {:in => ["Bachelor","Master"] }
validates :name, :uniqueness => true, :presence=>true validates :name, :uniqueness => true, :presence=>true
validates :zahl, :format=>{:with=>/^0(33|66)[0-9]{3}$/}, :uniqueness => true validates :zahl, :presence=>true, :format=>{:with=>/^0(33|66)[0-9]{3}$/}, :uniqueness => true
translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true
def batch_add_semester def batch_add_semester

6
app/views/lvas/show.html.erb
View File

@@ -11,8 +11,8 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<p> <p>
<%= @lva.lvanr %>
<b><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</b> <h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
</p> </p>
<p> <p>
@@ -25,4 +25,4 @@
<% end %> <% end %>
</ul> </ul>
<%= toolbar_html(@toolbar_elements) %> <%= render 'layouts/pretty_toolbar' %>