diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb index d2ee71f..7a2667c 100755 --- a/app/controllers/lvas_controller.rb +++ b/app/controllers/lvas_controller.rb @@ -16,6 +16,7 @@ class LvasController < ApplicationController @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)} + @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t('common.delete'), :path=> lva_path(@lva), :method=>:delete, :confirm=>"Sure?"} end # GET /lvas/new diff --git a/app/models/ability.rb b/app/models/ability.rb index 293df62..dd9aefd 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- class Ability include CanCan::Ability def initialize(user) @@ -27,7 +28,7 @@ class Ability # For Debug allow everything # Remove this line in production environment and for testing user management - # can :manage, :all + can :manage, :all can :addfetuser, User can :addfetadmin, User can [:show, :index], Studium diff --git a/config/locales/de.yml b/config/locales/de.yml index e6e8ed7..8ebc3cf 100755 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -7,39 +7,6 @@ de: edit: "Bearbeiten" actions: "Aktionen" delete: "Löschen" - studien: - list: "Studien der Fakultät Elektrotechnik" - anzeigen: "Studium anzeigen" - new: "Neues Studium" - allestudien: "Alle Studien" - loeschen: "Dieses Studium löschen" - edit: "Studium bearbeiten" - verwaltung: - title: "Studien verwalten" - explanation: "