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

studien

Browse Source
This commit is contained in:
Andreas Stephanides
2014-07-14 20:41:29 +05:30
parent adaf924fd7
commit 111e703274
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/gremien_controller.rb
View File

@@ -2,7 +2,7 @@ class GremienController < ApplicationController
# GET /gremien
# GET /gremien.json
load_and_authorize_resource
before_filter {@toolbar_elements=[]}
before_filter {@toolbar_elements=[]}
def verwalten
@gremien = Gremium.all
@gremientabs=Gremium.tabs
@@ -94,7 +94,7 @@ class GremienController < ApplicationController
@memberships<< Membership.new
@memberships<< Membership.new
render action: "edit", notice: 'gremium was successfully updated.'
end
}
format.json { head :no_content }
else
@@ -105,7 +105,8 @@ class GremienController < ApplicationController
end
# DELETE /gremien/1
# DELETE /gremien/1.json
#
#
def destroy
@gremium = Gremium.find(params[:id])
@gremium.destroy

2
app/controllers/studien_controller.rb
View File

@@ -34,7 +34,7 @@ class StudienController < ApplicationController
@toolbar_elements=[]
@toolbar_elements<<{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) } if can? :new, Studium
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)} if can? :edit, Studium
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_lvas_studium_path(@studium)} if can? :edit_lvas, Studium
@toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('lva.editlvas'),:path => edit_lvas_studium_path(@studium)} if can? :edit_lvas, Studium
@toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>'Sure?' } if can? :delete, Studium
@toolbar_modulgruppen =[]
@toolbar_modulgruppen << {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)} if can? :new, Modulgruppe