andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Kleinigkeiten, formatierung, bugfix

Browse Source
This commit is contained in:
Thomas Blazek
2013-07-25 16:59:28 +02:00
parent 0e4574603d
commit 0620185a8b
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/lvas_controller.rb
View File

@@ -9,7 +9,7 @@ class LvasController < ApplicationController
# GET /lvas/1 # GET /lvas/1
def show def show
@lva = Lva.find(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=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
end end

5
app/controllers/moduls_controller.rb
View File

@@ -3,14 +3,15 @@ class ModulsController < ApplicationController
# GET /moduls.json # GET /moduls.json
def index def index
@moduls = Modul.all @moduls = Modul.all
if @moduls
if !params[:studium_id].nil? if !params[:studium_id].nil?
@studium=Studium.find(params[:studium_id]) @studium=Studium.find_by_id(params[:studium_id])
end end
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @moduls } format.json { render json: @moduls }
end end
end
end end
# GET /moduls/1 # GET /moduls/1