diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index c1c18d6..6612e8c 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -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 diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index cbfd4a6..a7ec75a 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -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 diff --git a/app/views/studien/_semesteransicht.html.erb b/app/views/studien/_semesteransicht.html.erb index 3a82b05..37a9d1b 100644 --- a/app/views/studien/_semesteransicht.html.erb +++ b/app/views/studien/_semesteransicht.html.erb @@ -16,4 +16,4 @@ <% end %> - <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %> + diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb index 2a056bc..01dcdcd 100644 --- a/app/views/studien/show.html.erb +++ b/app/views/studien/show.html.erb @@ -3,31 +3,29 @@
<%= notice %>
+
-<%= raw(@studium.qualifikation) %> -
- <% else %> - <%= render partial: 'semesteransicht' %> - ++ <%= raw(@studium.qualifikation) %> +
+ <% else %> + <%= render partial: 'semesteransicht' %> + <% end %> + <% end %> <% end %> - - - <% end %> <% end %> <% end %> - - <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>